--- a/jdk/make/common/Release.gmk	Thu Mar 08 14:22:15 2012 -0800
+++ b/jdk/make/common/Release.gmk	Thu Mar 08 13:44:33 2012 -0800
@@ -965,9 +965,13 @@
           ($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \
 	done
 	$(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db
+ifndef NO_DEMOS
 	$(RM) -rf $(DEMODIR)/db
 	$(MV) $(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db
 	$(CP) $(ABS_DB_PATH)/README-JDK-DEMOS.html $(DEMODIR)/db/
+else
+	$(RM) -rf $(JDK_IMAGE_DIR)/db/demo
+endif
 	$(RM) $(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/register.html
 endif