diff --git a/make/common/Release.gmk b/make/common/Release.gmk
index da7f469093225d402b49867d0e280b753af3bd1f..23a11c2b09a37f1fc75c3fba3af774709757752b 100644
--- a/make/common/Release.gmk
+++ b/make/common/Release.gmk
@@ -345,7 +345,6 @@ TOOLS = \
 	sun/tools/jar		\
 	sun/tools/java		\
 	sun/tools/javac		\
-	sun/tools/javap		\
 	sun/tools/jps		\
 	sun/tools/jstat		\
 	sun/tools/jstatd	\
@@ -570,7 +569,6 @@ $(NOT_RT_JAR_LIST): FRC
 	$(ECHO) "sun/tools/asm/" >> $@
 	$(ECHO) "sun/tools/java/" >> $@
 	$(ECHO) "sun/tools/javac/" >> $@
-	$(ECHO) "sun/tools/javap/" >> $@
 	$(ECHO) "com/sun/tools/classfile/" >> $@
 	$(ECHO) "com/sun/tools/javap/" >> $@
 	$(ECHO) "sun/tools/jconsole/" >> $@
diff --git a/make/common/internal/Defs-langtools.gmk b/make/common/internal/Defs-langtools.gmk
index e90b00a061fc9a4cea24dee7bb699235adeb2482..57666aaf5bb4d1af3ca71b25de108ac7b72c1b97 100644
--- a/make/common/internal/Defs-langtools.gmk
+++ b/make/common/internal/Defs-langtools.gmk
@@ -40,6 +40,5 @@ IMPORT_TOOLS_PACKAGES +=            \
       com/sun/tools/javac           \
       com/sun/tools/javadoc         \
       com/sun/tools/javah           \
-      com/sun/tools/javap           \
-      sun/tools/javap
+      com/sun/tools/javap
 
diff --git a/make/launchers/Makefile b/make/launchers/Makefile
index a2f55870b07337a4e6acb8ad55458f4f4668eb82..e9f949c1b287d0309aeb701c8563c26d310a3aac 100644
--- a/make/launchers/Makefile
+++ b/make/launchers/Makefile
@@ -66,7 +66,7 @@ $(call make-launcher, jarsigner, sun.security.tools.JarSigner, , )
 $(call make-launcher, javac, com.sun.tools.javac.Main, , )
 $(call make-launcher, javadoc, com.sun.tools.javadoc.Main, , )
 $(call make-launcher, javah, com.sun.tools.javah.Main, , )
-$(call make-launcher, javap, sun.tools.javap.Main, , )
+$(call make-launcher, javap, com.sun.tools.javap.Main, , )
 $(call make-launcher, jconsole, sun.tools.jconsole.JConsole, \
   -J-Djconsole.showOutputViewer, )
 $(call make-launcher, jdb, com.sun.tools.example.debug.tty.TTY, , )