diff --git a/net-wireless/wifite/Manifest b/net-wireless/wifite/Manifest
index 547275f24..4a030b891 100644
--- a/net-wireless/wifite/Manifest
+++ b/net-wireless/wifite/Manifest
@@ -1,9 +1,10 @@
-AUX wifite-2-noupgrade.patch 377 RMD160 c93d9596c73f832d8a462e1c4c1cbe95a088e2cf SHA1 1a70382655cea59e1ecef33e618d056b7365e4b3 SHA256 0cc3912634760259a608b15e896464687edd2bca5504be3243cb594be09135ff
-AUX wifite-noupgrade.patch 1087 RMD160 9378e26f0ef9f7e2af0ed7b643ec0a1542c6fb44 SHA1 b4a02e0f2861d87d6bb6f3f6e1f7201c1f9cc158 SHA256 7f304ff8dc7f7ab9e6dcf366f457d7ea15c58db2e5e398ea9297ba440a6b0a66
-DIST wifite-0.84.py 119239 RMD160 44b46e0cd93722eb8562a46d96b9e374f75bcd2a SHA1 eb4e55b07844cda39174631ee49f75a7591b5b51 SHA256 02357c416552cb3fce408f3ca249094e3fc1c95f232b3a8082f197274f6081d7
-DIST wifite-2.0_beta_p10.py 94591 RMD160 008f6e77bea9e507aa164ee43e20a6fd2b316d10 SHA1 c2776428587c9a2455c3e77abbcbcea542a32651 SHA256 eaeb3ea3059478ed0d52e6522a6ca1d5364313390f5072dc66d05c0196e7b38e
-DIST wifite-2.85.py 98589 RMD160 7c5d55f901d08ef0042e5d0359d33b33d9a5b5bb SHA1 9834424f0616f0ccef7b888ab878f8856acd3f1c SHA256 fe0c7b1d40c2614bcf44e0d353d8d6d6faf85c20b29a3773a3bd9e239c25013d
-EBUILD wifite-0.84.ebuild 885 RMD160 41a8283ec227b0ae6cbc7e8f4cf5642c2ee634d4 SHA1 3aefecef5b93332cb15cfb342202619153fec5e4 SHA256 ce845cc6d73a528cb6868ba8a759616ebdd01027e3c89b71a5cf399f4d779882
-EBUILD wifite-2.0_beta_p10.ebuild 964 RMD160 faea4e5e7c95bb4edb65eaad600d958fe18c215d SHA1 cab9a6381a269f545693f129993fede1aa2df73f SHA256 7f4ceebf07eeae58ec5f2b5597b2a6169b1ba294e7878cef454d96f3ea8c04a9
-EBUILD wifite-2.85.ebuild 953 RMD160 2979067352b0664bcc69fd9762da9dfc9d381ce8 SHA1 05e2b6f0ae2353e92e8bd227fff9e88352b19f58 SHA256 84563b0612069ad2afe8d90f0ef8eaa4229a5278d72cd587a99750b2495a35a0
-MISC metadata.xml 459 RMD160 49d2ee145b93e7a161d4dfe1e074284633a8985a SHA1 bf9168039474074086b376eface12a169931ec0e SHA256 37f7bed856328ff87c08e4aa096bf5118363eac80dc97e58ef1a795c94f3bf49
+AUX wifite-2-noupgrade.patch 377 SHA256 0cc3912634760259a608b15e896464687edd2bca5504be3243cb594be09135ff SHA512 9d07d69bb4bceeae99bf23994473ab26a26a70df16a79cf3f7bf2378754ababf49de90052e30555aeec3c5afa968e605b8fd742f86df36853d3c0d49fdd464c5 WHIRLPOOL 064435f668df2c0de39725b608e2dc94bcb1b94ce4363e97c5fc06aeaf4cc9fe858ada72b69ac603cf3e5a2c84e17df38c06b4a82d9f0ae6423567f031b0c7ca
+AUX wifite-noupgrade.patch 1087 SHA256 7f304ff8dc7f7ab9e6dcf366f457d7ea15c58db2e5e398ea9297ba440a6b0a66 SHA512 343680facbd303a7e5ea154fa734d2e58bfab2ab26e0a618b469051cd34b946675f9b9ab8aa9a869a439394b1016f5da1a4282f5ef7663b8be0d9b3ef8a6ab6e WHIRLPOOL b6270b25cca0a0f1a72ab6fa51a1065b740975db1333653a2c39dba5b7e2d4c50931c20534eddf304fbabc0437594b2cb35f15b6a13128853e5742a975762930
+DIST wifite-0.84.py 119239 SHA256 02357c416552cb3fce408f3ca249094e3fc1c95f232b3a8082f197274f6081d7
+DIST wifite-2.0_beta_p10.py 94591 SHA256 eaeb3ea3059478ed0d52e6522a6ca1d5364313390f5072dc66d05c0196e7b38e
+DIST wifite-2.85.py 98589 SHA256 fe0c7b1d40c2614bcf44e0d353d8d6d6faf85c20b29a3773a3bd9e239c25013d SHA512 a36417a04f9cbfb5bcafa245827a62576cc96c46c2acb971d6782e9782cc239b2e4bec595bbfe170ee89d3d9fef8072f3e0c0344452b9c22e8012cb9166adfb3 WHIRLPOOL f3cc27a14f9366b5301e6ecfcfd11b391717075b702beb6eb0f5738f1ab26f17f1dde513c4d1d40660997c73a702b3d1a9669cc1fe1409285947e34ba0ba85da
+EBUILD wifite-0.84.ebuild 885 SHA256 ce845cc6d73a528cb6868ba8a759616ebdd01027e3c89b71a5cf399f4d779882 SHA512 b71cb7dfceb5d9410b4b110d39c645d51586375b719d02114549cf05e82930eb365779a5605fbb1a147625902df42edd4425416042a0abf75e73b0c4f9c07204 WHIRLPOOL d229a41d787a663c00f2a0f48ac5add9eb00d62cc84cc2080adaaf1ccb1d0e113d8acc76bd3c7826f6fe9203bb28b8d209c2b70674732be40116fc921ee28298
+EBUILD wifite-2.0_beta_p10.ebuild 964 SHA256 7f4ceebf07eeae58ec5f2b5597b2a6169b1ba294e7878cef454d96f3ea8c04a9 SHA512 fa7227f6dd889b900992ef180b495f5375530e2923f99a263bc8bc2c1a31a609eb834774e5409250ec1d261f66917a3ed74d12b81c7e571c2be6dc6a369b7057 WHIRLPOOL 40e030258f9c2e15347182ec80d4fe9cf683b6813a4558f0f5981287c515dc2107aa7a59b8d599a394d1af489b82b13b28b75136a174ef60caf9b721b52ce418
+EBUILD wifite-2.85-r1.ebuild 993 SHA256 7b3f192b242965b57ca9d7e1b919b18c775d759ba8d32ce5056a357a98cec92f SHA512 f172cd3de1740a66c205045905785232e193064de3b19c17356b51b87e63587c3c30932bbfeb1972189813a3e6ee6edab2adf8b8c8a4aa07532e2b96f3c252e9 WHIRLPOOL d6d7a71e1258e5a31e3d3821f150e76a192f01cdaf58041d7ff136230f9b31f23bcbd21ab6a02be47a99f4818564bec24966ef9868fcee9ab82cc73753620b9e
+EBUILD wifite-2.85.ebuild 953 SHA256 84563b0612069ad2afe8d90f0ef8eaa4229a5278d72cd587a99750b2495a35a0 SHA512 29aa2384d587011c8030b69b9652f7d380093d83450c930825ac85d4c2d65b4156eef93fa86fe3f00a6d2ff0e7728603caa389eb4685e78e95cc305342160dd6 WHIRLPOOL b3c8e15bf5c497f9006f8ba5659042509f0541f528151caac09bd508c22ff83767b9cb6ea710593bfaf448e88fa779d6045993d81debab45d5a911ba40c1d44a
+MISC metadata.xml 459 SHA256 37f7bed856328ff87c08e4aa096bf5118363eac80dc97e58ef1a795c94f3bf49 SHA512 750344b29468faed94b6ef57c9c1f31451d5d2f1f82688ab9b9db40797f56db011dec3296aef3e6fad453a292c97e6043d0e91f9b38440855e3c77c239d42dc1 WHIRLPOOL 0387b978b344b0ea5f3ce6b72fdd1e634f351825a2b466f424d8af3a66f0ec3ed921d6520e5319c718ba3b998749878579f7fdcb405dc3b310e32ef509576b65
diff --git a/net-wireless/wifite/wifite-2.85-r1.ebuild b/net-wireless/wifite/wifite-2.85-r1.ebuild
new file mode 100644
index 000000000..efd50156c
--- /dev/null
+++ b/net-wireless/wifite/wifite-2.85-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+EAPI=3
+PYTHON_DEPEND="2"
+#GUI interface is disabled in this version
+#PYTHON_USE_WITH="tk"
+#PYTHON_USE_WITH_OPT="tk"
+
+inherit python eutils versionator
+
+AVC=( $(get_version_components) )
+
+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"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="dict extra"
+
+DEPEND=""
+RDEPEND="net-wireless/aircrack-ng
+	dev-python/pexpect
+	dict? ( sys-apps/cracklib-words )
+	extra? ( app-crypt/pyrit
+		net-wireless/cowpatty
+		net-analyzer/macchanger
+		net-wireless/reaver )"
+#	tk? ( x11-terms/xterm )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	mkdir "${S}"
+	cp "${DISTDIR}"/${A} "${S}/${PN}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2-noupgrade.patch
+	python_convert_shebangs 2 "${S}"/${PN}
+}
+
+src_install() {
+	dobin wifite
+}