--- a/langtools/make/netbeans/langtools/build.xml	Tue Jun 14 12:46:35 2016 -0700
+++ b/langtools/make/netbeans/langtools/build.xml	Tue Jun 14 15:34:10 2016 -0700
@@ -218,7 +218,11 @@
 
             <sequential>
                 <java fork="true" jvm="${langtools.jdk.home}/bin/java" classname="@{mainclass}">
-                    <jvmarg line="-Xpatch:@{build.modules}"/>
+                    <jvmarg line="-Xpatch:java.compiler=@{build.modules}/java.compiler"/>
+                    <jvmarg line="-Xpatch:jdk.compiler=@{build.modules}/jdk.compiler"/>
+                    <jvmarg line="-Xpatch:jdk.javadoc=@{build.modules}/jdk.javadoc"/>
+                    <jvmarg line="-Xpatch:jdk.jdeps=@{build.modules}/jdk.jdeps"/>
+                    <jvmarg line="-Xpatch:jdk.jshell=@{build.modules}/jdk.jshell"/>
                     <jvmarg line="@{jpda.jvmargs}"/>
                     <arg line="@{args}"/>
                 </java>