--- a/jdk/make/gensrc/GensrcCharsetCoder.gmk	Sun Aug 10 19:39:01 2014 -0700
+++ b/jdk/make/gensrc/GensrcCharsetCoder.gmk	Sun Aug 17 15:54:13 2014 +0100
@@ -26,9 +26,9 @@
 GENSRC_CHARSETCODER :=
 
 GENSRC_CHARSETCODER_TMP := $(JDK_OUTPUTDIR)/gensrc
-GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio/charset
+GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/java/nio/charset
 
-GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
+GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
 
 GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template
 
@@ -101,7 +101,8 @@
 	$(MV) $@.tmp $@
 
 GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
+GENSRC_JAVA_BASE += $(GENSRC_CHARSETCODER)
 
 ###
 
-$(GENSRC_CHARSETCODER): $(BUILD_TOOLS)
+$(GENSRC_CHARSETCODER): $(BUILD_TOOLS_JDK)