--- old/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java	2016-09-15 19:47:38.000000000 +0530
+++ new/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java	2016-09-15 19:47:38.000000000 +0530
@@ -306,6 +306,12 @@
             if (Utils.isFunctional(plugin)) {
                 if (Utils.isAutoEnabled(plugin)) {
                     addEmptyArgumentMap(plugin);
+                    pluginsOptions.add(
+                        new PlugOption(false,
+                          (task, opt, arg) -> {
+                               pluginToMaps.remove(plugin);
+                          }, "--disable-" + plugin.getName())
+                    );
                 }
 
                 if (plugin instanceof DefaultCompressPlugin) {