--- old/./build.gradle	2016-08-17 11:02:06.225492841 -0400
+++ new/./build.gradle	2016-08-17 11:02:06.069498683 -0400
@@ -2321,7 +2321,7 @@
         classpath = project.files("build/libs/ant-javafx.jar", "build/classes/test", "build/resources/test")
         main = "hello.SimpleBundle"
         args = [
-                '-modulepath', JIGSAW_MODULES,
+                '--module-path', JIGSAW_MODULES,
                 '-o', "$projectDir/build/dev",
                 '-all',
                 packagerDevOpts
@@ -3004,9 +3004,9 @@
     tasks.withType(JavaCompile) { compile ->
         compile.options.forkOptions.executable = JIGSAW_JAVAC
         compile.options.compilerArgs = [
-                "-XaddExports:java.base/sun.security.pkcs=ALL-UNNAMED,"
-                        + "java.base/sun.security.timestamp=ALL-UNNAMED,"
-                        + "java.base/sun.security.x509=ALL-UNNAMED",
+                "--add-exports", "java.base/sun.security.pkcs=ALL-UNNAMED",
+                "--add-exports", "java.base/sun.security.timestamp=ALL-UNNAMED",
+                "--add-exports", "java.base/sun.security.x509=ALL-UNNAMED",
                 "-encoding", "UTF-8"]
     }
 }
@@ -3467,9 +3467,9 @@
     def modulesSrcDir = "${modularSdkDir}/modules_src"
     def modulesConfDir = "${modularSdkDir}/modules_conf"
     def modulesMakeDir = "${modularSdkDir}/make"
-    final File xpatchFile = file("${rootProject.buildDir}/xpatch.args")
+    final File patchmoduleFile = file("${rootProject.buildDir}/patchmodule.args")
 
-    project.files(xpatchFile);
+    project.files(patchmoduleFile);
 
     def zipTask = project.task("buildModuleZip$t.capital", type: Zip, group: "Build") {
         enabled = IS_BUILD_MODULE_ZIP
@@ -3566,24 +3566,24 @@
     zipTask.dependsOn(buildModulesTask);
     buildModules.dependsOn(buildModulesTask)
 
-    def buildModulesXpatchTask = task("buildModulesXpatch$t.capital", group: "Build") {
+    def buildModulesPatchTask = task("buildModulesPatch$t.capital", group: "Build") {
         doLast() {
-            xpatchFile.delete()
+            patchmoduleFile.delete()
 
-            logger.info("Creating xpatch.args file ${xpatchFile}")
+            logger.info("Creating patchmodule.args file ${patchmoduleFile}")
             String thepath=cygpath("${rootProject.buildDir}/sdk/${targetProperties.libDest}")
 
-            xpatchFile <<  "-Djava.library.path=${thepath}\n"
+            patchmoduleFile <<  "-Djava.library.path=${thepath}\n"
             moduleProjList.each { project ->
                 def moduleName = project.ext.moduleName
                 def dstModuleDir = cygpath("${modulesDir}/${moduleName}")
-                xpatchFile <<  "-Xpatch:${moduleName}=${dstModuleDir}\n"
+                patchmoduleFile <<  "--patch-module ${moduleName}=\"${dstModuleDir}\"\n"
             }
         }
     }
 
-    buildModulesXpatchTask.dependsOn(buildModulesTask)
-    buildModules.dependsOn(buildModulesXpatchTask)
+    buildModulesPatchTask.dependsOn(buildModulesTask)
+    buildModules.dependsOn(buildModulesPatchTask)
 
     def isWindows = IS_WINDOWS && t.name == "win";
     def isMac = IS_MAC && t.name == "mac";
@@ -3920,7 +3920,7 @@
         def testingDir = "${rootProject.buildDir}/${targetProperties.platformPrefix}testing";
         def patchesDir = new File("${testingDir}/modules");
         File patchPolicyFile = new File("${testingDir}/java.patch.policy");
-        File xpatchFile = new File("${testingDir}/xpatch.args");
+        File patchmoduleFile = new File("${testingDir}/patchmodule.args");
 
         String javaLibraryPath = "${rootProject.buildDir}/sdk/$targetProperties.libDest"
 
@@ -3928,7 +3928,7 @@
         def jigsawPatchesTestDir = new File("${testingDir}/tests/$moduleName");
 
         p.files(patchPolicyFile);
-        p.files(xpatchFile);
+        p.files(patchmoduleFile);
 
         def srcClassesDir = "${p.buildDir}/${targetProperties.platformPrefix}module-classes"
         Task classes =  p.task("jigsawCopyClasses${t.capital}", type: Copy, dependsOn: [p.classes]) {
@@ -3985,17 +3985,17 @@
         } else {
             patchPerms = rootProject.task(nameis) {
                 outputs.file(patchPolicyFile)
-                outputs.file(xpatchFile)
+                outputs.file(patchmoduleFile)
                 doLast() {
                     logger.info("Creating test patch.policy file ${patchPolicyFile}")
-                    logger.info("Creating test patch.policy file ${xpatchFile}")
+                    logger.info("Creating test patch.policy file ${patchmoduleFile}")
 
                     delete(patchPolicyFile)
-                    delete(xpatchFile)
+                    delete(patchmoduleFile)
                     mkdir(testingDir)
                     String thepath=cygpath("${rootProject.buildDir}/sdk/${targetProperties.libDest}")
 
-                    xpatchFile <<  "-Djava.library.path=${thepath}\n"
+                    patchmoduleFile <<  "-Djava.library.path=${thepath}\n"
                     moduleProjList.each { project ->
                         String themod = file("${patchesDir}/${project.ext.moduleName}").toURI()
                         patchPolicyFile <<  "grant codeBase \"${themod}\" {\n" +
@@ -4003,7 +4003,7 @@
                         "};\n"
 
                         def dstModuleDir = cygpath("${patchesDir}/${project.ext.moduleName}")
-                        xpatchFile <<  "-Xpatch:${project.ext.moduleName}=${dstModuleDir}\n"
+                        patchmoduleFile <<  "--patch-module ${project.ext.moduleName}=\"${dstModuleDir}\"\n"
                     }
                 }
             }
@@ -4057,7 +4057,7 @@
                 String bcp = "-Xbootclasspath/a:" + rootProject.projectDir.path + "/buildSrc/build/libs/buildSrc.jar"
 
                 systemProperties 'worker.debug': IS_WORKER_DEBUG
-                systemProperties 'worker.xpatch.file': cygpath(xpatchFile.path)
+                systemProperties 'worker.patchmodule.file': cygpath(patchmoduleFile.path)
                 if (addExportsFile != null) {
                     systemProperties 'worker.exports.file': cygpath(addExportsFile)
                 }
--- old/buildSrc/src/main/java/workaround/GradleJUnitWorker.java	2016-08-17 11:02:06.969464981 -0400
+++ new/buildSrc/src/main/java/workaround/GradleJUnitWorker.java	2016-08-17 11:02:06.817470673 -0400
@@ -145,21 +145,21 @@
         try {
             final ArrayList<String> cmd = new ArrayList<>(30);
             String gradleWorkerJar = null;
-            String xpatchesFile = null;
+            String patchmoduleFile = null;
             String exportsFile = null;
             String classpathFile = null;
             String jigsawJavapath = null;
 
             final String exportsFileProperty = "worker.exports.file";
             final String workerDebugProperty = "worker.debug";
-            final String xpatchesFileProperty = "worker.xpatch.file";
+            final String patchmoduleFileProperty = "worker.patchmodule.file";
             final String classpathFileProperty = "worker.classpath.file";
             final String javaCmdProperty = "worker.java.cmd";
 
             Collections.addAll(ignoreSysProps, defSysProps);
             ignoreSysProps.add(exportsFileProperty);
             ignoreSysProps.add(workerDebugProperty);
-            ignoreSysProps.add(xpatchesFileProperty);
+            ignoreSysProps.add(patchmoduleFileProperty);
             ignoreSysProps.add(classpathFileProperty);
             ignoreSysProps.add(javaCmdProperty);
 
@@ -175,10 +175,10 @@
                     int equals = args[i].indexOf("=");
                     exportsFile = args[i].substring(equals+1);
                     if (debug) System.err.println("XWORKER "+exportsFileProperty+"="+exportsFile);
-                } else if (args[i].contains(xpatchesFileProperty)) {
+                } else if (args[i].contains(patchmoduleFileProperty)) {
                     int equals = args[i].indexOf("=");
-                    xpatchesFile = args[i].substring(equals+1);
-                    if (debug) System.err.println("XWORKER "+xpatchesFileProperty+"="+xpatchesFile);
+                    patchmoduleFile = args[i].substring(equals+1);
+                    if (debug) System.err.println("XWORKER "+patchmoduleFileProperty+"="+patchmoduleFile);
                 } else if (args[i].contains(javaCmdProperty)) {
                     int equals = args[i].indexOf("=");
                     jigsawJavapath = args[i].substring(equals+1);
@@ -374,13 +374,13 @@
 
             cmd.add("-D"+javaCmdProperty+"="+java_cmd);
 
-            if (xpatchesFile == null) {
-                xpatchesFile = System.getProperty(xpatchesFileProperty);
+            if (patchmoduleFile == null) {
+                patchmoduleFile = System.getProperty(patchmoduleFileProperty);
             }
 
-            if (xpatchesFile != null) {
-                cmd.add("@" + xpatchesFile);
-                cmd.add("-D" + xpatchesFileProperty + "=" + xpatchesFile);
+            if (patchmoduleFile != null) {
+                cmd.add("@" + patchmoduleFile);
+                cmd.add("-D" + patchmoduleFileProperty + "=" + patchmoduleFile);
             }
 
             if (exportsFile == null) {
--- old/modules/javafx.base/src/test/addExports	2016-08-17 11:02:07.669438769 -0400
+++ new/modules/javafx.base/src/test/addExports	2016-08-17 11:02:07.517444461 -0400
@@ -1,9 +1,9 @@
 #
--XaddExports:javafx.base/com.sun.javafx.binding=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.collections=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.event=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.property.adapter=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.property=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.runtime=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.binding=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.property.adapter=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.property=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.runtime=ALL-UNNAMED
 #
--XaddExports:java.base/sun.util.logging=ALL-UNNAMED
+--add-exports java.base/sun.util.logging=ALL-UNNAMED
--- old/modules/javafx.controls/src/test/addExports	2016-08-17 11:02:08.373412405 -0400
+++ new/modules/javafx.controls/src/test/addExports	2016-08-17 11:02:08.221418097 -0400
@@ -1,30 +1,30 @@
--XaddExports:java.base/sun.util.logging=ALL-UNNAMED
+--add-exports java.base/sun.util.logging=ALL-UNNAMED
 #
--XaddExports:javafx.base/com.sun.javafx=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.binding=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.collections=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.event=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.property=ALL-UNNAMED
--XaddExports:javafx.base/javafx.beans.property=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.binding=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.property=ALL-UNNAMED
+--add-exports javafx.base/javafx.beans.property=ALL-UNNAMED
 #
--XaddExports:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.paint=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.paint=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
 #
--XaddExports:javafx.controls/com.sun.javafx.charts=ALL-UNNAMED
--XaddExports:javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
--XaddExports:javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED
--XaddExports:javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED
--XaddExports:javafx.controls/com.sun.javafx.scene.control.skin=ALL-UNNAMED
--XaddExports:javafx.controls/javafx.scene.chart=ALL-UNNAMED
+--add-exports javafx.controls/com.sun.javafx.charts=ALL-UNNAMED
+--add-exports javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
+--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED
+--add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=ALL-UNNAMED
+--add-exports javafx.controls/com.sun.javafx.scene.control.skin=ALL-UNNAMED
+--add-exports javafx.controls/javafx.scene.chart=ALL-UNNAMED
--- old/modules/javafx.fxml/src/test/addExports	2016-08-17 11:02:09.077386043 -0400
+++ new/modules/javafx.fxml/src/test/addExports	2016-08-17 11:02:08.925391735 -0400
@@ -1,15 +1,15 @@
--XaddExports:javafx.base/com.sun.javafx.collections=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
 #
--XaddExports:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
 #
--XaddExports:javafx.fxml/com.sun.javafx.fxml=ALL-UNNAMED
--XaddExports:javafx.fxml/com.sun.javafx.fxml.builder=ALL-UNNAMED
--XaddExports:javafx.fxml/com.sun.javafx.fxml.expression=ALL-UNNAMED
+--add-exports javafx.fxml/com.sun.javafx.fxml=ALL-UNNAMED
+--add-exports javafx.fxml/com.sun.javafx.fxml.builder=ALL-UNNAMED
+--add-exports javafx.fxml/com.sun.javafx.fxml.expression=ALL-UNNAMED
--- old/modules/javafx.graphics/src/test/addExports	2016-08-17 11:02:09.781359680 -0400
+++ new/modules/javafx.graphics/src/test/addExports	2016-08-17 11:02:09.625365522 -0400
@@ -1,48 +1,48 @@
--XaddExports:javafx.base/com.sun.javafx.collections=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.property=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.event=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.property=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED
 #
--XaddExports:javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom.transform=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.bmp=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.gif=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.png=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.menu=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.print=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.runtime.async=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.layout.region=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.shape=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.transform=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk.quantum=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.impl.shape=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.paint=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.animation.shared=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.effect=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.effect.light=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom.transform=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.bmp=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.gif=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.png=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.menu=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.print=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.runtime.async=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.layout.region=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.shape=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.transform=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk.quantum=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.impl=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.impl.shape=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.paint=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.animation.shared=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.effect=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.effect.light=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario=ALL-UNNAMED
 #
--XaddExports:java.base/sun.util.logging=ALL-UNNAMED
+--add-exports java.base/sun.util.logging=ALL-UNNAMED
--- old/modules/javafx.web/src/test/addExports	2016-08-17 11:02:10.485333318 -0400
+++ new/modules/javafx.web/src/test/addExports	2016-08-17 11:02:10.333339010 -0400
@@ -1,54 +1,54 @@
--XaddExports:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
 #
--XaddExports:javafx.graphics/com.sun.glass.utils=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.glass.utils=ALL-UNNAMED
 #
--XaddExports:javafx.base/com.sun.javafx.collections=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.property=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx=ALL-UNNAMED
--XaddExports:javafx.base/com.sun.javafx.event=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.collections=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.property=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED
 #
--XaddExports:javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom.transform=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.bmp=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.gif=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.png=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.menu=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.print=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.runtime.async=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.layout.region=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.transform=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk.quantum=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.impl=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.impl.shape=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.prism.paint=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.animation.shared=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.effect=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario.effect.light=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.scenario=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom.transform=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.bmp=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.gif=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.png=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.menu=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.perf=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.print=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.runtime.async=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.input=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.layout.region=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.text=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.transform=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.scene.traversal=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.sg.prism=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.stage=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk.quantum=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.impl=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.impl.shape=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.prism.paint=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.animation.shared=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.effect=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario.effect.light=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.scenario=ALL-UNNAMED
 #
--XaddExports:javafx.web/com.sun.webkit=ALL-UNNAMED
--XaddExports:javafx.web/com.sun.webkit.dom=ALL-UNNAMED
--XaddExports:javafx.web/com.sun.javafx.scene.web=ALL-UNNAMED
--XaddExports:javafx.web/com.sun.webkit.text=ALL-UNNAMED
--XaddExports:javafx.web/com.sun.webkit.network=ALL-UNNAMED
+--add-exports javafx.web/com.sun.webkit=ALL-UNNAMED
+--add-exports javafx.web/com.sun.webkit.dom=ALL-UNNAMED
+--add-exports javafx.web/com.sun.javafx.scene.web=ALL-UNNAMED
+--add-exports javafx.web/com.sun.webkit.text=ALL-UNNAMED
+--add-exports javafx.web/com.sun.webkit.network=ALL-UNNAMED
--- old/tests/system/src/test/addExports	2016-08-17 11:02:11.189306955 -0400
+++ new/tests/system/src/test/addExports	2016-08-17 11:02:11.033312797 -0400
@@ -1,22 +1,22 @@
--XaddExports:java.base/sun.util.logging=ALL-UNNAMED
+--add-exports java.base/sun.util.logging=ALL-UNNAMED
 #
--XaddExports:javafx.base/com.sun.javafx=ALL-UNNAMED
+--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED
 #
--XaddExports:javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.geom.transform=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.bmp=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.gif=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.iio.png=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
--XaddExports:javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.animation=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.css.parser=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.embed=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.font=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.geom.transform=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.bmp=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.common=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.gif=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.iio.png=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.image.impl=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.image=ALL-UNNAMED
+--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
--- old/tests/system/src/test/java/test/util/Util.java	2016-08-17 11:02:11.905280143 -0400
+++ new/tests/system/src/test/java/test/util/Util.java	2016-08-17 11:02:11.749285984 -0400
@@ -185,7 +185,7 @@
          */
         final Boolean isJigsaw = Boolean.getBoolean("worker.isJigsaw");
         final String workerJavaCmd = System.getProperty("worker.java.cmd");
-        final String workerXpatchFile = System.getProperty("worker.xpatch.file");
+        final String workerPatchModuleFile = System.getProperty("worker.patchmodule.file");
         final String workerPatchPolicy = System.getProperty("worker.patch.policy");
         final String workerClassPath = System.getProperty("worker.classpath.file");
         final Boolean workerDebug = Boolean.getBoolean("worker.debug");
@@ -198,8 +198,8 @@
             cmd.add("java");
         }
 
-        if (isJigsaw && workerXpatchFile != null) {
-            cmd.add("@" + workerXpatchFile);
+        if (isJigsaw && workerPatchModuleFile != null) {
+            cmd.add("@" + workerPatchModuleFile);
         } else {
             String jfxdir = getJfxrtDir(classpath);
             Assert.assertNotNull("failed to find jfxdir",jfxdir);
@@ -208,7 +208,7 @@
 
         // This is a "minimum" set, rather than the full @addExports
         if (isJigsaw) {
-            cmd.add("-XaddExports:javafx.graphics/com.sun.javafx.application=ALL-UNNAMED");
+            cmd.add("--add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED");
         }
 
         if (isJigsaw && workerClassPath != null) {
@@ -229,7 +229,7 @@
             try {
                 if (workerPatchPolicy != null) {
                     // with Jigsaw, we need to create a merged java.policy
-                    // file that contains the permissions for the Xpatch classes
+                    // file that contains the permissions for the patchmodule classes
                     // as well as the permissions needed for this test
 
                     File wpp = new File(workerPatchPolicy);
--- old/tools/scripts/make_xpatch.sh	2016-08-17 11:02:12.621253330 -0400
+++ new/tools/scripts/make_xpatch.sh	2016-08-17 11:02:12.465259172 -0400
@@ -82,8 +82,8 @@
         echo "Warning: ${mod} package is missing from $MODTOP/${mod}"
     fi
     mp=`do_cygpath "$MODTOP/${mod}"`
-    echo "-Xpatch:${mod}=\"$mp\""
-    echo "-Xpatch:${mod}=\"$mp\"" >> "${XPATCHFILE}"
+    echo "--patch-module ${mod}=\"$mp\""
+    echo "--patch-module ${mod}=\"$mp\"" >> "${XPATCHFILE}"
 
     # note: javafx.base exists, but currently does not have any shared libs in it.
     # add it anyway