diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index 73e3c212a..916dcf732 100644
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -2,5 +2,5 @@ AUX w3af 37 RMD160 ba77819fa632e1e32001d7042d1922b69f68e6d0 SHA1 47e9945bddeda0a
 AUX w3af_console 45 RMD160 0090458f417ae79f17afbfb281d6f83532f89843 SHA1 c8e598281327f733a5e7bb3004b340e93e362dd8 SHA256 baec5ace41ba0ff29b792dd288ee9a14eef83546af633620125644ad29fd19c7
 AUX w3af_gui 41 RMD160 ef08894b771089f92271cb57fe508f429b5a2c49 SHA1 0d213bd93b317bc37d1a1f69caea8c24bde69952 SHA256 12f98d26f6c844b74e9d12a4df12ac8430eeb627dd15e8452e37202d254dda69
 DIST w3af-1.0-rc3.tar.bz2 19128303 RMD160 63f775c967d0c5d5149befc868f1872a021b0d68 SHA1 f0004aece2a21c12acddb90c71cc40b9cc5d557f SHA256 36bf724726ec152f125680597f7314a424717cf2f1aa464ca4f18b7c5361ac86
-EBUILD w3af-1.0_rc3.ebuild 921 RMD160 44ae4ba57cfee3cb94c71748ee57f3c642c9748c SHA1 d092ee3afcce6bb784e9e438aa90d95119899fb3 SHA256 f37058c73cd02f19f6bebc1450ea9fa80f0299acedce2892e9f58df4fcdc848a
-EBUILD w3af-9999.ebuild 845 RMD160 227b73e4f14146b54ee7cc437d48f64642f88436 SHA1 ec9f18a0a716dd86ae766df78d081541c233c64c SHA256 70f087b5f25038dc29630cad5035f026aa4fcc75eed6375dcc09d8d181ef8ceb
+EBUILD w3af-1.0_rc3.ebuild 926 RMD160 edaea4ab7d11ef56555d15edc41a800a343e2eeb SHA1 a21c86fd2e8be8cda708d3313ad5804498c79078 SHA256 aead99216cfb2ecce7594ea3e744ab5d90db14b480aa3285d6762c40f1fa8ef7
+EBUILD w3af-9999.ebuild 916 RMD160 75ca367b178fa4565ff03a35e8e53afc8a6e64e6 SHA1 f0f666527c143291844806562e81487e4be947a0 SHA256 039df7c2a5b1099273bc97773c1ac073ca35424d839caf0d47eeecea4444ac7f
diff --git a/net-analyzer/w3af/w3af-1.0_rc3.ebuild b/net-analyzer/w3af/w3af-1.0_rc3.ebuild
index 2bc719335..9344c7060 100644
--- a/net-analyzer/w3af/w3af-1.0_rc3.ebuild
+++ b/net-analyzer/w3af/w3af-1.0_rc3.ebuild
@@ -17,7 +17,7 @@ IUSE="+gtk"
 
 DEPEND=""
 RDEPEND=">=dev-python/fpconst-0.7.2
-	dev-python/pygoogle
+	dev-python/pygoogle-ajax
 	dev-python/pyPdf
 	dev-python/utidylib
 	dev-python/soappy
diff --git a/net-analyzer/w3af/w3af-9999.ebuild b/net-analyzer/w3af/w3af-9999.ebuild
index 3dfa02bd5..e13fc031b 100644
--- a/net-analyzer/w3af/w3af-9999.ebuild
+++ b/net-analyzer/w3af/w3af-9999.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit distutils subversion
 
 DESCRIPTION="Web Application Attack and Audit Framework"
@@ -10,18 +12,19 @@ ESVN_REPO_URI="https://w3af.svn.sourceforge.net/svnroot/w3af/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=""
 RDEPEND=">=dev-python/fpconst-0.7.2
-	 dev-python/pygoogle
+	 dev-python/pygoogle-ajax
 	 dev-python/pyPdf
 	 dev-python/utidylib
 	 dev-python/soappy
 	 dev-python/beautifulsoup
 	 dev-python/pyopenssl
-	 net-analyzer/scapy"
+	 net-analyzer/scapy
+	 gtk? ( dev-python/pygtk )"
 
 src_compile() {
 	einfo "Nothing to compile"
@@ -31,7 +34,9 @@ src_install() {
 	dodir /usr/lib/
 	# should be as simple as copying everything into the target...
 	cp -pPR "${S}" "${D}"usr/lib/w3af || die
-	dobin "${FILESDIR}"/w3af_gui
+	if use gtk; then
+		dobin "${FILESDIR}"/w3af_gui
+	fi
 	dobin "${FILESDIR}"/w3af_console
 	chown -R root:0 "${D}"
 }