--- a/jdk/make/common/Defs-linux.gmk	Tue Apr 17 08:49:50 2012 -0700
+++ b/jdk/make/common/Defs-linux.gmk	Tue Apr 17 09:02:57 2012 -0700
@@ -157,9 +157,7 @@
     _JUNK_ := $(shell \
       echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
 
-    # HACK: disable ZIP_DEBUGINFO_FILES by default until install repo
-    # changes are promoted
-    ZIP_DEBUGINFO_FILES ?= 0
+    ZIP_DEBUGINFO_FILES ?= 1
 
     _JUNK_ := $(shell \
       echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)")