diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
index 0ed1f6a21..965c5c957 100644
--- a/dev-ruby/metasploit-payloads/Manifest
+++ b/dev-ruby/metasploit-payloads/Manifest
@@ -2,7 +2,9 @@ DIST metasploit-payloads-0.0.3.gem 5118976 SHA256 854f231bc093bcbb86dac3c466110d
 DIST metasploit-payloads-0.0.7.gem 5126144 SHA256 3ca51f06174cad908ec61a9a41c0933ea54cc264a458efa16c4413051f7d8261 SHA512 44af8c99385e64645ef05d9e91996e7e68ccbc937acb842702bca6189669215bf316672bd7265d19b6454a047bc7eee07636e218e3ab3754f80eacd03ad7d272 WHIRLPOOL f282582366e41435fa2c648c149c5ccb8e2688ccefd544571c49c0d2e486a9774b6b4434b62621156c5f543ad6ee39780c59bcfe06d3bad96bc9e02c055fb140
 DIST metasploit-payloads-1.0.3.gem 5204992 SHA256 9179efab9210193b2369dca8a1c7042a106493376f8481d7c3cec0ca85ce6156 SHA512 b8d9ddd9bdb7be41e4501ad68d6c567547b1c4b8f87d5aa7641a93d9fdc92bfcb1774b221e12493fb797a5f7a5dc7778a6dc9de2021eff90ad7d9fab53789cc5 WHIRLPOOL 8317484a6bd814a2dc07ed80e65819063bfb7cd986b7eef75b721111d95e32dc641dc5e5fc0164431862848d863a8d620fb29053362f44c62a26114467318d4c
 DIST metasploit-payloads-1.0.4.gem 5220864 SHA256 e784165696a18ecb6dab8cb7954e4c9f2624067c3b9fc372e8098ed21a40100d SHA512 e6fd09d7eb650935005c16f45eab141258a7c11ceb239efa1a075fa7273a9d28ce3fef29baacc7b3bf13c8b4d475ad6d12aba84d9c94e6d2e220a05c8127c447 WHIRLPOOL 82b22b040888c4f89198df621b35a04362d7e7d168428a7417212a7c7ce7cb76bac2530db9618745bb5bab06fc7fc3957d22b73b439d2d8cd84845f8ab12ccce
+DIST metasploit-payloads-1.0.7.gem 5222912 SHA256 c17ae7f4bb4025abf682c743294046a37645703c54e68201ce2e184d7d0a5816 SHA512 b4b0eafca4db8ab3fcabf892236a04cb501e0a2bf77a4f828615a84c2a859dcfeab813363f1f0cf57e7fa82d238ace6751a61e8d38cda303176674ab3eb8372d WHIRLPOOL af47640edf9bb915171e75b486ff14628d474da2e083dd9aca1640cc109c1cf9308c61193246866a934c454f6953929831636572fa1101b4b5a4ca728c8090d0
 EBUILD metasploit-payloads-0.0.3.ebuild 955 SHA256 bf44a83b47e66f1240c7af150e9d7eb9a7392bb3ec2c41ac1b7e60364cb7a54b SHA512 f2ac23013fca8ecd20dae599dfb15f3360aa73572ae1b8f47697bf42113faf55f2f8e2aa9872a5ca3f2218f03e6d35e42089ad169a23ffdbca4bd4cf8388a982 WHIRLPOOL a963eae291ebfffc503dbda0c61536417d4571b79aa5b88a98db51d62dfcc2653ff7919538e67462aa98772c888ebb451cdc70a93665f3aee633e8d12ae4cf23
 EBUILD metasploit-payloads-0.0.7.ebuild 955 SHA256 bf44a83b47e66f1240c7af150e9d7eb9a7392bb3ec2c41ac1b7e60364cb7a54b SHA512 f2ac23013fca8ecd20dae599dfb15f3360aa73572ae1b8f47697bf42113faf55f2f8e2aa9872a5ca3f2218f03e6d35e42089ad169a23ffdbca4bd4cf8388a982 WHIRLPOOL a963eae291ebfffc503dbda0c61536417d4571b79aa5b88a98db51d62dfcc2653ff7919538e67462aa98772c888ebb451cdc70a93665f3aee633e8d12ae4cf23
 EBUILD metasploit-payloads-1.0.3.ebuild 1224 SHA256 7e26beae0a151a6f50b6b68e70b1b6a721bd590d369e5be412e25d0b0ae7e75a SHA512 2815b6ff99234a2d12ad62f878acd2a5f2e1794e58892b25d2e36e25064bab50561635a2162b2dbd8675709744a66aa327df78e2f8a73b71e29c097b62ae8e80 WHIRLPOOL 621b6a689b47e458194de0b23e2bfecd6293206f2074a6595d98e753122023bbc6bbb00ac252d34842caae27e6071d856d23bb81cbf03841e6cd50b91ececee6
 EBUILD metasploit-payloads-1.0.4.ebuild 1224 SHA256 7e26beae0a151a6f50b6b68e70b1b6a721bd590d369e5be412e25d0b0ae7e75a SHA512 2815b6ff99234a2d12ad62f878acd2a5f2e1794e58892b25d2e36e25064bab50561635a2162b2dbd8675709744a66aa327df78e2f8a73b71e29c097b62ae8e80 WHIRLPOOL 621b6a689b47e458194de0b23e2bfecd6293206f2074a6595d98e753122023bbc6bbb00ac252d34842caae27e6071d856d23bb81cbf03841e6cd50b91ececee6
+EBUILD metasploit-payloads-1.0.7.ebuild 1224 SHA256 7e26beae0a151a6f50b6b68e70b1b6a721bd590d369e5be412e25d0b0ae7e75a SHA512 2815b6ff99234a2d12ad62f878acd2a5f2e1794e58892b25d2e36e25064bab50561635a2162b2dbd8675709744a66aa327df78e2f8a73b71e29c097b62ae8e80 WHIRLPOOL 621b6a689b47e458194de0b23e2bfecd6293206f2074a6595d98e753122023bbc6bbb00ac252d34842caae27e6071d856d23bb81cbf03841e6cd50b91ececee6
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.7.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.7.ebuild
new file mode 100644
index 000000000..bdaca4406
--- /dev/null
+++ b/dev-ruby/metasploit-payloads/metasploit-payloads-1.0.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/meterpreter_bins/meterpreter_bins-0.0.10.ebuild,v 1.1 2014/10/19 23:24:24 zerochaos Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
+HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
+
+LICENSE="BSD"
+
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#no tests
+RESTRICT=test
+
+QA_PREBUILT="
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
+	usr/$(get_libdir)/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
+	"
+
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index f19b7d9cc..b99c4d9a2 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -13,4 +13,4 @@ AUX msfweb.confd 273 SHA256 006040ecd27dc0279c2bea6d69365fe1f0d66f507c039ae43720
 AUX msfweb.initd 533 SHA256 4fd9668e4b467ecfa5160e2c108ac8ace71fbeaefaf829d2f7bfb566d44bb13c SHA512 ec8eb9c09191d273417174c23d2fb1a3d27939a74b010fa33ca696bcce88e9c81d6cc1e6ebff90ea97cb6d730776364de4560db1bed10516ba4a7030e7233a53 WHIRLPOOL dec6ca3cf45ac4e6cea35266df1342b4dcdb3f813dc90820603f23e9d62ee67a9633de17d747cc12d7cb9c982e8868559896c2f8c42540a5005f485045d9730a
 DIST metasploit-4.11.1_p2015051401.tar.gz 34520825 SHA256 b91f56f24512e4e28b7b8a3703044b4193c3e49d1e80f1d832f2f1c6127ea688 SHA512 eea502886ebfc09e728aec1a1e9d6324acfceb7932f51202994aa1339e368b9c94ddc02749ba7e8ee918ba3b32c7a5799b9689048617c3416d401fc5ecad7a3f WHIRLPOOL 074f22a5bf5f07ba7c3226b6477daf840e949cc011da8d769efec8ad2fee984840361d70f9e085c56dad48f7e71f571b7d7749500cc44c0fcfea95971d33c840
 EBUILD metasploit-4.11.1_p2015051401-r1.ebuild 11205 SHA256 10fb29ca3cbd6db84787ca0cdb3e232e2be38ca3df41c598aeceedd37c0e632f SHA512 00a61b6ad5dc6e728e4f69ad4e59a8efd408d0305d3feef6aca864810c02a4665c4e3991e5720ecb7377a9ea37a26325ed86cf355115d1f0b3a68b28a449bb31 WHIRLPOOL d775831c266099b200b8bde518b91bfa5d2da28f67c4a5a7177893d147becb0a594dfcefff78e2c01cd31b14cb84617350308fb831acbb7ffdcca4d219fea81a
-EBUILD metasploit-9999.ebuild 11271 SHA256 71921557a1babacd160d38f22ba24c4f771ce652f1df28cd853ba1effb6f9399 SHA512 7822ab022a7b2c0ce9e1f74b46374f1fd4c8c339cc0bd7580e6b3bae76d6b0a94c789fff5cb0df947b16ab4bca09eb7cdafda6ac23f2325373071ffb1261d378 WHIRLPOOL 49e4dd98d589ee1847fafaff174669f26b53ebdd23ab0c0f24cf6f11556a4a30e1d298cd3d1b0afac9f1b505bdb1d941cb138f119bf1df8d8dc30a1f54f1b386
+EBUILD metasploit-9999.ebuild 11271 SHA256 770deb5a0110efe928d2ba6898cbfe4e279f3e5d2a01db98cf0dc1ce2a5e3745 SHA512 9c5ee6461c52ab7a72c8ab6d5353da3ed9b3fd503807d557e4dc34b7d3877e68de75d252e6818ee0e525f25628ebf97e73a3238d19de2649e1d6c558617f67ca WHIRLPOOL c907d1049b7b4c226947673156867697482cc732c0b65f33d354ac75f8ccbec5c2b8df6009289bef18fe589c260c6202e67c07b7c68359480947dd8321b6b0d4
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 372913bfa..1911896a5 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild
@@ -46,7 +46,7 @@ RUBY_COMMON_DEPEND="virtual/ruby-ssl
 	dev-ruby/kissfft
 	=dev-ruby/metasploit_data_models-1.2.5
 	dev-ruby/meterpreter_bins:0.0.22
-	dev-ruby/metasploit-payloads:1.0.4
+	dev-ruby/metasploit-payloads:1.0.7
 	>=dev-ruby/metasploit-credential-1.0.0:1.0
 	>=dev-ruby/metasploit-concern-1.0.0:1.0
 	>=dev-ruby/metasploit-model-1.0.0:1.0