diff -r 836adbf7a2cd -r 3317bb8137f4 jdk/make/gensrc/GensrcBuffer.gmk
--- a/jdk/make/gensrc/GensrcBuffer.gmk	Sun Aug 10 19:39:01 2014 -0700
+++ b/jdk/make/gensrc/GensrcBuffer.gmk	Sun Aug 17 15:54:13 2014 +0100
@@ -26,9 +26,9 @@
 GENSRC_BUFFER := 
 
 GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc
-GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
+GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
+GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
 
 ###
 
@@ -377,4 +377,5 @@
 
 ###
 
-$(GENSRC_BUFFER): $(BUILD_TOOLS)
+$(GENSRC_BUFFER): $(BUILD_TOOLS_JDK)
+GENSRC_JAVA_BASE += $(GENSRC_BUFFER)