diff --git a/dev-java/oracle-jdk-bin/metadata.xml b/dev-java/oracle-jdk-bin/metadata.xml
index e5ef7922b3215..165190f3d7ec7 100644
--- a/dev-java/oracle-jdk-bin/metadata.xml
+++ b/dev-java/oracle-jdk-bin/metadata.xml
@@ -13,5 +13,6 @@
Install JavaFX libraries
Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files
Install JVM (and optionally JavaFX) sources
+ Install VisualVM debugging tool
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild
index 319645de7f438..cd57314695a9a 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.131.ebuild
@@ -60,7 +60,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )"
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
SLOT="1.8"
KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source"
+IUSE="alsa commercial cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source visualvm"
REQUIRED_USE="javafx? ( alsa fontconfig )"
RESTRICT="fetch preserve-libs strip"
@@ -236,8 +236,8 @@ src_install() {
# provided, they generally lag behind what Gentoo has available.
rm -vf jre/lib/*/libavplugin* || die
- # We package this as dev-util/visualvm.
- rm -vfr lib/visualvm || die
+ # Packaged as dev-util/visualvm but some users prefer this version.
+ use visualvm || find -name "*visualvm*" -exec rm -vfr {} + || die
dodoc COPYRIGHT
dodir "${dest}"