--- a/jdk/makefiles/GenerateData.gmk	Thu Jun 07 20:40:02 2012 -0700
+++ b/jdk/makefiles/GenerateData.gmk	Thu Jun 07 20:40:50 2012 -0700
@@ -35,11 +35,43 @@
 include Tools.gmk
 
 # Now include all the rules that generate data resources.
-# These are written directly into newclasses dir.
+# These are written directly into classes dir.
+GENDATA :=
 
 include GendataBreakIterator.gmk
 GENDATA += $(BREAK_ITERATOR)
 
+include GendataFontConfig.gmk
+GENDATA += $(GENDATA_FONT_CONFIG)
+
+include GendataTimeZone.gmk
+GENDATA += $(GENDATA_TIMEZONE)
+
+include GendataHtml32dtd.gmk
+GENDATA += $(GENDATA_HTML32DTD)
+
+##########################################################################################
+
+GENDATA_UNINAME := $(JDK_OUTPUTDIR)/classes/java/lang/uniName.dat
+
+$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt $(BUILD_TOOLS)
+	$(MKDIR) -p $(@D)
+	$(TOOL_CHARACTERNAME) $< $@
+
+GENDATA += $(GENDATA_UNINAME)
+
+##########################################################################################
+
+GENDATA_CURDATA := $(JDK_OUTPUTDIR)/lib/currency.data
+
+$(GENDATA_CURDATA): $(JDK_TOPDIR)/src/share/classes/java/util/CurrencyData.properties $(BUILD_TOOLS)
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(TOOL_GENERATECURRENCYDATA) -o $@.temp < $<
+	$(MV) $@.temp $@
+
+GENDATA += $(GENDATA_CURDATA)
+
 ##########################################################################################
 
 $(GENDATA) : $(BUILD_TOOLS)