diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index deaa5d4f2..214ba23be 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -10,4 +10,4 @@ DIST framework-2.7.tar.gz 5800216 RMD160 cfdf2705522c845bb4405413207a7df0f3873b9
 DIST jboss_seam_remote_command_rb 3412 RMD160 c577b1bd75943f2ddceea3161bc1037dd0150c2f SHA1 b858c726d3ee26317726635373d5db3b7eeb774d SHA256 c87f1cc1b82ed105c7bf551db7e3bad0a787244c4cdd124015a3ff24cedd23df
 DIST vbsmem-1.2.1.patch 69002 RMD160 281461151b0d1e453ee613326f4457eebaddebaa SHA1 883a582552e00102be452a2a0105b9e016b3dccc SHA256 7991a5629c562817919c9bb1c8f0a3bdcd1c63cf9b9f32f322d1d266416589d2
 EBUILD metasploit-2.7-r1.ebuild 1689 RMD160 c042574474bb0d98280c87221aaa059e4cd19c1a SHA1 153b6db16f42488af570ebafc466935848f137f0 SHA256 160811ff63adbdad713edf6c74375d4cd8463df5492bb0250f72fe772ee24fa8
-EBUILD metasploit-9999.ebuild 10023 RMD160 93faff619bae20439824f326d13fdfb11a276e41 SHA1 2774d40c3ac06045ff7ce7fe5dc8a5d1106bcd08 SHA256 e747771ed1719ebcfe3b10fbac0cdd7d421addc1cc7a97cb8c1786897d90afb8
+EBUILD metasploit-9999.ebuild 10249 RMD160 1c47255fb679fd5ffcef2a8d554f9bbd79ce92d9 SHA1 6df6bdd23865955281dafe3f0866274550e27604 SHA256 c30b5ec8005dd360adcc2d2ea78bcfa1b1e837fe00dfa502212b0e468603df2e
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 5bc168fc6..f49d6e264 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-lang/ruby[ssl]
 	dev-ruby/rubygems
 	>=app-crypt/johntheripper-1.7.9-r1[-minimal]
 	!arm? ( dev-ruby/hpricot
+		dev-util/metasm
 		virtual/jdk
 		dev-ruby/rjb
 		>=dev-ruby/msgpack-0.4.6
@@ -189,6 +190,10 @@ src_install() {
 	rm -rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/gems/activerecord*
 	rm -rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/lib/gemcache/ruby/1.9.1/gems/msgpack*
 
+	#unundle the metasm, might break stuff, requires functionality testing
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/lib/metasm.rb
+	rm -rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/lib/metasm
+
 	#while we are commiting fixes for filth, let's bogart msfupdate
 	echo "#!/bin/sh" > "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/msfupdate
 	echo "echo \"[*]\"" >> "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/msfupdate
@@ -231,7 +236,7 @@ pkg_postinst() {
 	elog "Adjust /usr/$(get_libdir)/${PN}${SLOT}/armitage.yml and /etc/conf.d/msfrpcd${PV} files if necessary"
 	if use eselect; then
 		elog
-		elog "Use the following commend to manage metasploit links:"
-		elog " # eselect metasploit"
+		elog "To switch between installed slots, execute as root:"
+		elog " # eselect metasploit set [slot number]"
 	fi
 }