--- a/jdk/make/launcher/Launcher-jdk.jlink.gmk	Thu Apr 28 08:26:38 2016 -0700
+++ b/jdk/make/launcher/Launcher-jdk.jlink.gmk	Tue May 03 09:09:57 2016 +0100
@@ -32,6 +32,7 @@
 
 $(eval $(call SetupBuildLauncher, jlink,\
     MAIN_CLASS := jdk.tools.jlink.internal.Main, \
+    JAVA_ARGS := -addmods ALL-DEFAULT, \
     CFLAGS := -DENABLE_ARG_FILES \
         -DEXPAND_CLASSPATH_WILDCARDS \
         -DNEVER_ACT_AS_SERVER_CLASS_MACHINE, \