diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild
index 0d8a40ccf226f..436fb8fe611e7 100644
--- a/dev-java/icedtea/icedtea-3.16.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild
@@ -70,8 +70,8 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
+	jamvm +jbootstrap kerberos libressl pax_kernel +pch
+	pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
 
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk? ( !headless-awt )"
@@ -155,9 +155,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 	virtual/pkgconfig
 	pax_kernel? ( sys-apps/elfix )"
 
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-	pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="pulseaudio? ( dev-java/icedtea-sound )"
 
 S="${WORKDIR}"/${ICEDTEA_PKG}
 
@@ -371,6 +369,7 @@ src_install() {
 pkg_postinst() {
 	xdg_icon_cache_update
 	java-vm-2_pkg_postinst
+	einfo "JavaWebStart functionality provided by icedtea-web package"
 }
 
 pkg_postrm() {
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index ee6c54b859890..55c624c0a0673 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -27,7 +27,6 @@
 		<flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
 		<flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
 		<flag name="kerberos">Link against Kerberos in order to obtain the cache location.</flag>
-		<flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
 		<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
 		<flag name="pch">Build using pre-compiled headers.</flag>
 		<flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
@@ -35,6 +34,5 @@
 		<flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
 		<flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
 		<flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
-		<flag name="webstart">Enable Web Start support (via NetX).</flag>
 	</use>
 </pkgmetadata>