diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index 769bf20a0..11c2cf9d8 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,5 +1,5 @@
 AUX database.yml 481 SHA256 2db3df7b05f28aa5ba6d6dedc32d8d1a2e24e020d6fd8aea15b2e76ed0f6ab46 SHA512 98a83f972f78ee63d241b58fbdce3171a24b2435371d46cad609f2f2ad50a5853cbfda5cf4632cfd9e69b2fb7ba3ce3c6aa765c7b44fbeb3eed868ffc068241d WHIRLPOOL ac85e47c26dcf56d69028af91513802767a2243ff52f6e031d447dfbda9120bd6436b4a0c6ab118cf3fd09dc3b47613e4e75c8ef83f4528783402bba1ab5e2ba
 AUX metasploit.icon 7630 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949 SHA512 569db261a3782f3874c30ccaf076be512437a9a5a9df835baf29bacec48dd76b2896e009b5ab165ba82aff72ab15d067155f257787e69c3a7cd034dafa5a9066 WHIRLPOOL 3f66eb2a3b51dc787f5da6b2fd93165fdca3e9ae391db0ea69cb0ea5c6c1d9f2d85fffbdb117da4065e0b3e29daa5b7d7e62740cd3210768aa0cfc4a63679376
 DIST framework-4.6.0.tar.bz2 49996884 SHA256 ec6dfe58cb5a897e8c8e56d919dec7c00d56fe758efd1350c2a7a3587ef538c2 SHA512 ff73ebd5e08f96d7ffb63ad59cd4fa608705a1a72f00b82ce074fc537e7037349fedf71f768a895ec4e36aabb4ae07fd6b6a0f12ff88807b8ca9202f0d770633 WHIRLPOOL 952407ce34e0d94f7a824c6a3b963c6321da9aee0626295389b1f4f7d4671b9577e5bfab8f581144696f6c4a1bb073f7b7056d8c54853dbf60a6dcb7c320b336
-EBUILD metasploit-4.6.0.ebuild 6549 SHA256 81d09ed3f5f3c9cbc53977b6ea74ffd5baf803058a3dbe0bad51350283dad2be SHA512 5e5fcd3989b3b88e07afcd9c3651c393995318982856f27227d1bd5daa001880d789da66bba9941012aa2e52cd2cc5064684774bbe182d3852d1fd74935f7533 WHIRLPOOL c689c426b83dac641f015d44b5c10e0ac8505d0701b8d82e2562cbc91687173e9260578569313648e102f79863df96f4fc43f059d519622d1c2966d7d41fede6
-EBUILD metasploit-9999.ebuild 6551 SHA256 f1ba01b0f118c0de6446a7d84caeebb804893f535fac1322a978138f72e88d99 SHA512 0b09ccbc480755b0e20fdc3a98667be66e096ed393635910ae16daa6017704cb5a7d822427f7299d3c342580e4e8ac0909a6e2a404fe6317fd812a9f73bae431 WHIRLPOOL 07660e5eab809645bc7867ab2e1b58ad8343bb9ddff3cb315dd832478f6f307f4a5391525a93b9af838cf68bcadbc670de14fb29ebc539c72fe6323d5b4106ef
+EBUILD metasploit-4.6.0.ebuild 6483 SHA256 0ae5144844b639582da0d8065527f9cc17e6444ed6e567ac4635322f78a316af SHA512 b3620b31bf92e2d9538011f52833fb1d5d4d309125a8530281534891093c2e131f91e6478420c4005937e3c175a2e28966d59b82e3bd8c251c536a60958f5c24 WHIRLPOOL ae57c0a01c47436674174bbf5eaf9e1217d694e21f0a97b5e4c09738700b740e3de6a6f5ab538b983295fd9cf3efa390b88749baac1bb0bef677cc587cbe1de0
+EBUILD metasploit-9999.ebuild 6485 SHA256 707ed4a5bed12735abe930d6de7d9e517f38e17661e247be4acef48e714ad445 SHA512 7ca19f981ef04bab1f71d40f107f2a66025e4ccf397e24c01230f73b70f4c0872108aeb71635a798768bb1c30b17c6a8b96d0e3191c3327ebc7fb3d87bfcc728 WHIRLPOOL 0dd194b28bce7ca3cdb232e91d5b9ef5f73a1ec989ef46989346b972a2722622edd15c83d1250e9d05dfd826cac68746401e5772b58f56beaa66ecd73ecccbce
diff --git a/net-analyzer/metasploit/metasploit-4.6.0.ebuild b/net-analyzer/metasploit/metasploit-4.6.0.ebuild
index 3cb1a2e49..70affceba 100644
--- a/net-analyzer/metasploit/metasploit-4.6.0.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.6.0.ebuild
@@ -11,17 +11,19 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
 	inherit git-2
 	KEYWORDS=""
+	S="${WORKDIR}/${MY_P}"
 else
 	#https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
 	SRC_URI="http://downloads.metasploit.com/data/releases/archive/framework-${PV}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/msf3
 fi
 
 DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 SLOT="4.6"
 LICENSE="BSD"
-IUSE="gui +java lorcon +pcaprub serialport test"
+IUSE="gui +java lorcon pcaprub serialport test"
 
 DEPEND="lorcon? ( net-wireless/lorcon[ruby] )"
 RDEPEND="${DEPEND}
@@ -70,8 +72,6 @@ QA_PREBUILT="
 	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
 	"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	#so much cruft is bundled with msf that we will fix it in src_prepare to make intentions more clear
 
@@ -178,8 +178,7 @@ pkg_postinst() {
 	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
 
 	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml and /etc/conf.d/msfrpcd${PV} files if necessary"
-	elog "You might need to run env-update and relogin"
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
 }
 
 pkg_config() {
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 29643eaf1..874023ca7 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -11,17 +11,19 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git"
 	inherit git-2
 	KEYWORDS=""
+	S="${WORKDIR}/${MY_P}"
 else
 	#https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version
 	SRC_URI="http://downloads.metasploit.com/data/releases/archive/framework-${PV}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}"/msf3
 fi
 
 DESCRIPTION="Advanced open-source framework for developing, testing, and using vulnerability exploit code"
 HOMEPAGE="http://www.metasploit.org/"
 SLOT="9999"
 LICENSE="BSD"
-IUSE="gui +java lorcon +pcaprub serialport test"
+IUSE="gui +java lorcon pcaprub serialport test"
 
 DEPEND="lorcon? ( net-wireless/lorcon[ruby] )"
 RDEPEND="${DEPEND}
@@ -70,8 +72,6 @@ QA_PREBUILT="
 	usr/$(get_libdir)/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso
 	"
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
 	#so much cruft is bundled with msf that we will fix it in src_prepare to make intentions more clear
 
@@ -178,8 +178,7 @@ pkg_postinst() {
 	"${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT}
 
 	einfo
-	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml and /etc/conf.d/msfrpcd${PV} files if necessary"
-	elog "You might need to run env-update and relogin"
+	elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary"
 }
 
 pkg_config() {
diff --git a/profiles/pentoo/base/package.use/net-analyzer b/profiles/pentoo/base/package.use/net-analyzer
index 9bd37cf06..ee2640f1c 100644
--- a/profiles/pentoo/base/package.use/net-analyzer
+++ b/profiles/pentoo/base/package.use/net-analyzer
@@ -1,8 +1,9 @@
-net-analyzer/nmap ipv6 lua nping gtk python
-net-analyzer/snort dynamicplugin zlib
-net-analyzer/wireshark gcrypt gnutls kerberos threads ares geoip portaudio smi third-party-plugins
-net-analyzer/ucsniff ffmpeg plugins
 net-analyzer/ettercap plugins
+net-analyzer/metasploit lorcon
+net-analyzer/metasploit:9999 pcaprub
+net-analyzer/nmap ipv6 lua nping gtk python
 net-analyzer/scapy gnuplot pyx
-
+net-analyzer/snort dynamicplugin zlib
+net-analyzer/ucsniff ffmpeg plugins
+net-analyzer/wireshark gcrypt gnutls kerberos threads ares geoip portaudio smi third-party-plugins
 net-wireless/wpa_supplicant ap