diff -r 5b8d8cec6280 -r f0a29ee25e5b jdk/make/java/zip/Makefile
--- a/jdk/make/java/zip/Makefile	Wed Mar 06 18:35:51 2013 +0100
+++ b/jdk/make/java/zip/Makefile	Wed Mar 06 17:43:10 2013 -0800
@@ -68,6 +68,16 @@
     FILES_reorder += reorder-$(ARCH)
   endif
 endif
+
+#
+# Use mapfile unconditionally (even with fastdebug).
+# JDK's internal zlib is incompatible with stock zlib, because the
+# size of struct z_stream has been changed, so internal zlib
+# implementation must not be allowed to leak outside of libzip.so,
+# else you get hard to debug failures with fastdebug jdk when user
+# native code includes stock zlib.
+#
+FILES_m = mapfile-vers
 include $(BUILDDIR)/common/Mapfile-vers.gmk
 include $(BUILDDIR)/common/Library.gmk