diff --git a/net-wireless/wifite/Manifest b/net-wireless/wifite/Manifest
index bad07ce75..e081e9134 100644
--- a/net-wireless/wifite/Manifest
+++ b/net-wireless/wifite/Manifest
@@ -1,6 +1,6 @@
 AUX wifite-noupgrade.patch 1087 RMD160 9378e26f0ef9f7e2af0ed7b643ec0a1542c6fb44 SHA1 b4a02e0f2861d87d6bb6f3f6e1f7201c1f9cc158 SHA256 7f304ff8dc7f7ab9e6dcf366f457d7ea15c58db2e5e398ea9297ba440a6b0a66
-DIST wifite-0.82.py 119201 RMD160 0c24c2b88f417248fe4d8673f3436563ee30c2fb SHA1 83e55be7330a77e73511b0414bd9eb53caaa6d8d SHA256 7d03f9e5ad3b90f724b9e818cdc2fa53f27a3a1831448c853cd038367de6a26a
 DIST wifite-0.84.py 119239 RMD160 44b46e0cd93722eb8562a46d96b9e374f75bcd2a SHA1 eb4e55b07844cda39174631ee49f75a7591b5b51 SHA256 02357c416552cb3fce408f3ca249094e3fc1c95f232b3a8082f197274f6081d7
-EBUILD wifite-0.82.ebuild 885 RMD160 41a8283ec227b0ae6cbc7e8f4cf5642c2ee634d4 SHA1 3aefecef5b93332cb15cfb342202619153fec5e4 SHA256 ce845cc6d73a528cb6868ba8a759616ebdd01027e3c89b71a5cf399f4d779882
+DIST wifite-2.0_beta_p10.py 94591 RMD160 008f6e77bea9e507aa164ee43e20a6fd2b316d10 SHA1 c2776428587c9a2455c3e77abbcbcea542a32651 SHA256 eaeb3ea3059478ed0d52e6522a6ca1d5364313390f5072dc66d05c0196e7b38e
 EBUILD wifite-0.84.ebuild 885 RMD160 41a8283ec227b0ae6cbc7e8f4cf5642c2ee634d4 SHA1 3aefecef5b93332cb15cfb342202619153fec5e4 SHA256 ce845cc6d73a528cb6868ba8a759616ebdd01027e3c89b71a5cf399f4d779882
+EBUILD wifite-2.0_beta_p10.ebuild 968 RMD160 e06ab265c22b30409aa7a4b56175bbf7080a51f0 SHA1 2edf7c6d2b6ae12ac3fef717277402f4ec8b7b23 SHA256 8525a50e6cb441824a74754d0472e58f21dae76534f52d7cc26e5f33a8c7f8b9
 MISC metadata.xml 459 RMD160 49d2ee145b93e7a161d4dfe1e074284633a8985a SHA1 bf9168039474074086b376eface12a169931ec0e SHA256 37f7bed856328ff87c08e4aa096bf5118363eac80dc97e58ef1a795c94f3bf49
diff --git a/net-wireless/wifite/wifite-0.82.ebuild b/net-wireless/wifite/wifite-2.0_beta_p10.ebuild
similarity index 63%
rename from net-wireless/wifite/wifite-0.82.ebuild
rename to net-wireless/wifite/wifite-2.0_beta_p10.ebuild
index 536dad4eb..479007f2a 100644
--- a/net-wireless/wifite/wifite-0.82.ebuild
+++ b/net-wireless/wifite/wifite-2.0_beta_p10.ebuild
@@ -7,17 +7,17 @@ PYTHON_DEPEND="2"
 PYTHON_USE_WITH="tk"
 PYTHON_USE_WITH_OPT="tk"
 
-inherit python eutils versionator
-
-AVC=( $(get_version_components) )
+inherit python
 
 DESCRIPTION="Mass WEP/WPA cracker"
 HOMEPAGE="http://code.google.com/p/wifite/"
-SRC_URI="http://wifite.googlecode.com/svn-history/r${AVC[1]}/trunk/wifite.py -> ${P}.py"
+#SRC_URI="http://wifite.googlecode.com/svn-history/r${AVC[1]}/trunk/wifite.py -> ${P}.py"
+# Annoying: github is a temporary location for alpha releases
+SRC_URI="https://github.com/derv82/wifite/raw/4ad0ae3b3d141944d0baf881d739a35c1851e8f5/wifite.py -> ${P}.py"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="dict extra tk"
 
 DEPEND=""
@@ -26,7 +26,8 @@ RDEPEND="net-wireless/aircrack-ng
 	dict? ( sys-apps/cracklib-words )
 	extra? ( app-crypt/pyrit
 		net-wireless/cowpatty
-		net-analyzer/macchanger )
+		net-analyzer/macchanger
+		net-wireless/reaver-wps )
 	tk? ( x11-terms/xterm )"
 
 S=${WORKDIR}/${PN}
@@ -36,10 +37,6 @@ src_unpack() {
 	cp "${DISTDIR}"/${A} "${S}/${PN}"
 }
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-noupgrade.patch
-}
-
 src_install() {
 	dobin wifite
 }