--- old/modules/fxpackager/src/main/java/com/oracle/tools/packager/JLinkBundlerHelper.java	2016-02-17 08:16:39.000000000 -0800
+++ new/modules/fxpackager/src/main/java/com/oracle/tools/packager/JLinkBundlerHelper.java	2016-02-17 08:16:38.000000000 -0800
@@ -28,7 +28,6 @@
 import com.sun.tools.jdeps.Main;
 import jdk.tools.jlink.Jlink;
 import jdk.tools.jlink.builder.ImageBuilder;
-import jdk.tools.jlink.plugin.PluginOption;
 import jdk.tools.jlink.plugin.Plugin;
 
 import java.io.ByteArrayOutputStream;
@@ -186,7 +185,7 @@
 
         pluginList.add(Jlink.newPlugin(
                 "strip-native-commands",
-                Collections.singletonMap(new PluginOption.Builder("strip-native-commands").build(), "on"),
+                Collections.singletonMap("strip-native-commands", "on"),
                 null
         ));
 
@@ -194,7 +193,7 @@
         // strip debug symbols
         pluginList.add(Jlink.newPlugin(
                 "exclude-files",
-                Collections.singletonMap(new PluginOption.Builder("exclude-files").build(), "*libjfxmedia_qtkit.dylib,*diz"),
+                Collections.singletonMap("exclude-files", "*libjfxmedia_qtkit.dylib,*diz"),
                 null
         ));
 
@@ -208,7 +207,7 @@
                         key,
                         //pos++,
                         //false,
-                        Collections.singletonMap(new PluginOption.Builder(key).build(), value),
+                        Collections.singletonMap(key, value),
                         null
             ));
         }