--- a/jdk/make/launcher/Launcher-java.desktop.gmk	Thu Apr 28 08:26:38 2016 -0700
+++ b/jdk/make/launcher/Launcher-java.desktop.gmk	Tue May 03 09:09:57 2016 +0100
@@ -31,7 +31,7 @@
 ifndef BUILD_HEADLESS_ONLY
   $(eval $(call SetupBuildLauncher, appletviewer, \
       MAIN_CLASS := sun.applet.Main, \
-      JAVA_ARGS := -addmods ALL-SYSTEM, \
+      JAVA_ARGS := -addmods ALL-DEFAULT, \
       LIBS_unix := $(X_LIBS), \
   ))
 endif