diff --git a/net-analyzer/zarp/Manifest b/net-analyzer/zarp/Manifest
index 81162eb05..f4d31d5be 100644
--- a/net-analyzer/zarp/Manifest
+++ b/net-analyzer/zarp/Manifest
@@ -1,3 +1,4 @@
 AUX zarp 47 SHA256 54305235736a959c3c7de6075562407016fd00faeee1c003fdd3c04108257759 SHA512 48c173216535678ebe0823b1c35b2fc4660a3e861afc9eba5d478c03a224b2d0795e4be0f5e56452acdbdaef56297441bea5d45da2d883c4f07f03d44c27923e WHIRLPOOL 742ffcdb8256d274db9b6f148222a4ccf33821a4cb26214db7023ebc47f53638ed3aa97518f5eae9ef7e726b51943bef671ad6e0f97d05ebd3d72a3dd5452d36
-EBUILD zarp-20130527.ebuild 1053 SHA256 7e908420f4914e016995ca2572adbff87038fb7814afaef9e3b463c7373d9821 SHA512 14cf04bac84b54da7df08e90a504d636caf9272e5fb3e0f46c3b8c5a571328992b9c937cd3251bd85c708c07924343d3abb30ad46a20c6af6c73bb4a9010372e WHIRLPOOL b618f15bd0ad554a542a63fd74a06c401e8a52f8e14de571f438d1b5ca764b3757208c3dc514ae63b47df691b069d348c9cb15aeb905cd252c456aadbbc86587
+DIST zarp-0.1.5.tar.gz 425427 SHA256 9a195ec4ee1a17488ae35305b22a71c784b3465edbe99d4c8ec7b739ae714c99 SHA512 650b371a0a088b61e3a1d4783e68a08af599c6f687445324f3fdd7c3c0a097651757f8de00844e9014998b91183e675cebfac9835f7df65ed0255b0e9fb0ba79 WHIRLPOOL 2de2525c9478bcc96d554ec5e7590136cfee7939115e44e233687c31bd2ce8aebac2edf02ceeac470f522cd718cf2724ec63615d4c32090aa67bcf5995f319cb
+EBUILD zarp-0.1.5.ebuild 984 SHA256 ebb2c310cb3df6949f0194b1ebb5de9a537115aba2c7a2f31f97ed1d4a9a6d3c SHA512 bd9917881e86d931c23922cf26993e6acdc90bb4f3e57a6a2625f07f0c6d4e8c8c3a405ea4460101de6f4d8806e5f04e10313e00c1d6c4dffd961b4e091f3eed WHIRLPOOL 79d07f8ed15b2179cdc28e54f0e8081d7da25480c9c2c0d2d9b8e1dd4f4a53c8dad7be0d850166b10283d7c1670284821ef0520bc71954be4d171e64c1e89d02
 EBUILD zarp-20130724.ebuild 1017 SHA256 3431535be6bb4d0d93747d29702c848889d92a087497d589b3954d7d321be96b SHA512 5372e4c4a991ecbaea9bf425010d0cc19c33adcb4c726db2c771b6f16d5271d35ed0d9c819a8dcf5ceb5442b9b9beac438b894859a12b6d675d232e9e94960ca WHIRLPOOL e8c80e2bfd8992d723be198b471b65108d4de9334ece39bc1404156fc975ab2060402a876e11f68d530be3ae4341f05809a916bb82aaa27394b39fc5e5cd205c
diff --git a/net-analyzer/zarp/zarp-20130527.ebuild b/net-analyzer/zarp/zarp-0.1.5.ebuild
similarity index 61%
rename from net-analyzer/zarp/zarp-20130527.ebuild
rename to net-analyzer/zarp/zarp-0.1.5.ebuild
index 51a477711..058076125 100644
--- a/net-analyzer/zarp/zarp-20130527.ebuild
+++ b/net-analyzer/zarp/zarp-0.1.5.ebuild
@@ -1,41 +1,34 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
+# $Header: blshkv $
 
 EAPI="5"
 
-PYTHON_DEPEND="2"
-
-inherit git-2 multilib python
+PYTHON_COMPAT=( python2_{6,7} )
+inherit multilib python-r1
 
 HOMEPAGE="https://defense.ballastsecurity.net/wiki/index.php/Zarp"
 DESCRIPTION="Local network attack toolkit"
-EGIT_REPO_URI="https://github.com/hatRiot/zarp.git"
-EGIT_COMMIT="c3926ce003534b7d8cbf88cc2766739650364c3f"
+SRC_URI="https://github.com/hatRiot/zarp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+wireless"
 
 DEPEND=""
 RDEPEND="dev-python/paramiko
+	dev-python/netlib
+	dev-python/flask
 	net-analyzer/scapy
 	net-analyzer/tcpdump
 	net-libs/nfqueue-bindings
 	wireless? ( net-wireless/aircrack-ng )"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-	# TODO: unbundle the following:
-	# rm Wifite
-	# rm Scapy
-}
+# TODO: unbundle the following:
+# rm Wifite
+# rm Scapy
+# libmproxy (netlib, flask)
 
 src_install() {
 	# should be as simple as copying everything into the target...
diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer
index 6ca7cc424..749c9ac1e 100644
--- a/profiles/pentoo/base/package.accept_keywords/net-analyzer
+++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer
@@ -40,7 +40,7 @@ net-analyzer/multimon-ng
 ~net-analyzer/fragroute-1.2-r3
 ~net-analyzer/geoedge-0.2
 ~net-analyzer/hunt-1.5-r1
-~net-analyzer/hydra-7.5
+~net-analyzer/hydra-7.6
 ~net-analyzer/hyenae-0.36_p1
 ~net-analyzer/ike-scan-1.9
 ~net-analyzer/inguma-0.4
@@ -99,5 +99,4 @@ net-analyzer/nessus-plugins
 ~net-analyzer/wolpertinger-0.6
 ~net-analyzer/xplico-1.0.1
 ~net-analyzer/xprobe-0.3
-=net-analyzer/zarp-2013*
 ~net-analyzer/zmap-1.1.1