--- a/jdk/make/launcher/Launcher-jdk.jshell.gmk	Tue Dec 20 20:26:34 2016 +0000
+++ b/jdk/make/launcher/Launcher-jdk.jshell.gmk	Tue Dec 20 13:46:44 2016 -0800
@@ -26,6 +26,6 @@
 include LauncherCommon.gmk
 
 $(eval $(call SetupBuildLauncher, jshell, \
-    MAIN_CLASS := jdk.internal.jshell.tool.JShellTool, \
+    MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \
     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
 ))