diff --git a/dev-java/oracle-jre-bin/metadata.xml b/dev-java/oracle-jre-bin/metadata.xml
index 87c0c72cc0cff..8442caf9ee0cf 100644
--- a/dev-java/oracle-jre-bin/metadata.xml
+++ b/dev-java/oracle-jre-bin/metadata.xml
@@ -7,6 +7,7 @@
   </maintainer>
   <longdescription>Oracle Java SE Runtime Environment, Official Binary Distribution</longdescription>
   <use>
+    <flag name="commercial">Install features requiring a commercial license for production use</flag>
     <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
     <flag name="javafx">Install JavaFX libraries</flag>
     <flag name="jce">Install Java Cryptographic Extension Unlimited Strength Jurisdiction Policy Files</flag>
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
index e40a4da8edf96..5808f5e700af1 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.121.ebuild
@@ -35,7 +35,7 @@ SRC_URI="
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.8"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa cups +fontconfig headless-awt javafx jce nsplugin selinux"
+IUSE="alsa commercial cups +fontconfig headless-awt javafx jce nsplugin selinux"
 
 RESTRICT="fetch preserve-libs strip"
 QA_PREBUILT="*"
@@ -141,6 +141,10 @@ src_install() {
 		rm -vf lib/*/libjsoundalsa.* || die
 	fi
 
+	if ! use commercial; then
+		rm -vfr lib/jfr* || die
+	fi
+
 	if use headless-awt ; then
 		rm -vf lib/*/lib*{[jx]awt,splashscreen}* \
 		   bin/{javaws,policytool} || die