diff --git a/net-analyzer/wpscan/Manifest b/net-analyzer/wpscan/Manifest
index bf89b4b87..6e5506169 100644
--- a/net-analyzer/wpscan/Manifest
+++ b/net-analyzer/wpscan/Manifest
@@ -1,2 +1,3 @@
-AUX wpscan 44 SHA256 1b88ec8311ed0c8d214c4da74d4619662f05eedb82e6c3d588be26bf207334f4 SHA512 0ff0390343e11baa32dd123e86e2f46764d94adfc090e4fbd52d7d41ddc02c3b0d11fe20149d9af88e2c4669e38586a93a0324e995a289c76e178ecef522b6e6 WHIRLPOOL 314fff55e5ad6fbd8632392292268c65cf58312acd364c0204fc2407f551d7f44b9c3b3288cbb9bfcd2fe2733bc71e7d481b7629254f3658d7e36b066565cfe3
-EBUILD wpscan-9999.ebuild 677 SHA256 5d038938f9489dc2261c1d27315400d5e12a0969a81505296d59b6eeb507be21 SHA512 71970dd6917fb2aa73056b2743df9beb1459397e328e21ab8f27ecac49193bfb3327042d9e1f6ea1f608c30a75c85ec6883afd7df3ae87d94c2888a75f60e705 WHIRLPOOL fa7f2b0d02c0a531458b09b6c73d1b0be65d9a8386dae456ed329297d5fd95c150bbb2df36db95d9761df8ab0d24fd8ff94e771d62d0f61d9763868d3c2970fb
+AUX wpscan 47 SHA256 f9c467158ea7ade44abf628b571ace82ea07c73c72f6b04e0506a51c06f30246 SHA512 bbcd7f1f8fd1ff99678b0fa33529530a327a22125573ea2c4036a918679244f8153f3b3951546e48df307d2345bae62af59e1a60bf28ccef214e4a9efa6d1848 WHIRLPOOL 6fbb55f94be40dcd6a9dbc1f006c4c744a0cf4b5468cb8b670d70859771a977a158a0a8f221e1d20b21c34c2755d6299d9b02c77f6a23c826f6f43c543a01fb4
+AUX wpstools 49 SHA256 d6c0a8e151c64f686064adca9bef09f2bce505f0753b374c75147c9d3a2de852 SHA512 0a9cfad0ac94d2181639022305f237eaca766f13db07c530417d90da72d718d4969e438d4e3ab0fb07e80da564382aa42d26b6f6211f9d20e6d8096ed87cf53f WHIRLPOOL cfda9da79489d91439c9d72773ae24ffd9129980bcae186a2d352d029e6c207978a7a583f8908378ac57d7497df9daca45ac0d7fec90be916c42b6830687103d
+EBUILD wpscan-9999.ebuild 681 SHA256 99beaedb9fedbbf19fa2a5a6bd799537e251a922d9c1e692e89f5d8c94d616a3 SHA512 56ed6912fa9c58dfdfd776d43a9280580b39520df9dc38b601ad5a186fbfb840ae7658dcd0a9de7a37e0729d425faedd740a71eade76ac81ca42453ed0826234 WHIRLPOOL 87595c1d9e016a2f5b550642ea1e805f8eca10c53781e19ea22f4e23ccb749a03ab5bd0ca2a1c2188723aec86f8093c57fda65396b5605b9eb544cc89286a2b6
diff --git a/net-analyzer/wpscan/files/wpscan b/net-analyzer/wpscan/files/wpscan
index 09abd462e..a9c20551a 100644
--- a/net-analyzer/wpscan/files/wpscan
+++ b/net-analyzer/wpscan/files/wpscan
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ruby19 /usr/lib/wpscan/wpscan.rb
+ruby19 /usr/lib/wpscan/wpscan.rb $@
diff --git a/net-analyzer/wpscan/files/wpstools b/net-analyzer/wpscan/files/wpstools
new file mode 100644
index 000000000..02fc54bc0
--- /dev/null
+++ b/net-analyzer/wpscan/files/wpstools
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ruby19 /usr/lib/wpscan/wpstools.rb $@
diff --git a/net-analyzer/wpscan/wpscan-9999.ebuild b/net-analyzer/wpscan/wpscan-9999.ebuild
index b05cb542e..5499e7651 100644
--- a/net-analyzer/wpscan/wpscan-9999.ebuild
+++ b/net-analyzer/wpscan/wpscan-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="git://github.com/wpscanteam/wpscan.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND=""
@@ -24,7 +24,7 @@ RDEPEND="dev-lang/ruby
 	dev-ruby/json"
 
 src_prepare() {
-	rm -r .git ./cache .gitignore .rspec README.md
+	rm -r .git .gitignore .rspec README.md
 }
 
 src_install() {
@@ -34,5 +34,5 @@ src_install() {
 	doins -r *
 
 	dobin "${FILESDIR}"/wpscan
-#	dosym wpstools.rb
+	dobin "${FILESDIR}"/wpstools
 }