--- a/make/common/NON_CORE_PKGS.gmk	Fri Jul 01 16:50:32 2016 -0700
+++ b/make/common/NON_CORE_PKGS.gmk	Wed Jul 06 20:56:27 2016 -0700
@@ -81,7 +81,9 @@
 
 JCONSOLE_PKGS = com.sun.tools.jconsole
 
-JSHELLAPI_PKGS = jdk.jshell
+JSHELLAPI_PKGS = jdk.jshell \
+    jdk.jshell.spi \
+    jdk.jshell.execution
 
 TREEAPI_PKGS = com.sun.source.doctree \
     com.sun.source.tree \