diff -r 487c6b61f6a6 -r 9df4dd548612 jdk/make/common/Defs-windows.gmk
--- a/jdk/make/common/Defs-windows.gmk	Tue Apr 17 08:49:50 2012 -0700
+++ b/jdk/make/common/Defs-windows.gmk	Tue Apr 17 09:02:57 2012 -0700
@@ -113,9 +113,7 @@
   echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)")
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-  # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
-  # changes are promoted
-  ZIP_DEBUGINFO_FILES ?= 0
+  ZIP_DEBUGINFO_FILES ?= 1
 else
   ZIP_DEBUGINFO_FILES=0
 endif