diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index 1ed807169..ac63b1309 100644
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -1 +1,2 @@
 DIST w3af-1.6.0.5.tar.gz 26307179 SHA256 2ca4e1c0749adc396d780412dde2720274d9fa591746dd96481796a9d2d98b39 SHA512 e956d87ca3b92ac8f34e6ea35194d3b43cfe6b939e698dabc3c9d1dd6d12c6cb9d65e78e3afb4bba625cc276677f44bea503c396c4e807909c966b3734935751 WHIRLPOOL fd1b5fce5ab0ba4da295a43f8cff5a563da6f9f10407e402ddf3fb73527ddca9f6f809440cc3600979ee798d9f2717b411475a7aba4243bb0cfeab4e61a31b66
+DIST w3af-1.6.54.tar.gz 23762936 SHA256 e63b7088a3fb93d20b7b936d5cc3db639c24166cf8da6358c73c71afffdd0291 SHA512 8132bb3ee0433739b9a3bd4a6b25d90e9f71d915eb1f7a63c382199bfc8b9dc5abe6bdd73c7715ab5804e6cf22a99f8ba98ac39cee92a5f3e547f7cb939f8ac6 WHIRLPOOL 466be054eb2229a6ad2d9555b97513bf5d086570a2604bdfb139443e2b6212954d2d07722b380c3b4e34b18019e3e3b745efbb1d138665ae43b8a56c272b729f
diff --git a/net-analyzer/w3af/w3af-1.6.54.ebuild b/net-analyzer/w3af/w3af-1.6.54.ebuild
index ce011d7b8..d6585c1d2 100644
--- a/net-analyzer/w3af/w3af-1.6.54.ebuild
+++ b/net-analyzer/w3af/w3af-1.6.54.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv Exp $
+# $Id$
 
 EAPI=5
 
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python2_7 )
 
-inherit multilib python-r1 versionator git-r3
+inherit multilib python-r1 versionator
 
 MY_P=${PN}-"$(replace_version_separator 2 '-')"
 DESCRIPTION="Web Application Attack and Audit Framework"
 HOMEPAGE="http://w3af.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/andresriancho/w3af.git"
+SRC_URI="https://github.com/andresriancho/w3af/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="doc gtk clamav"
 
 RDEPEND="dev-python/pyClamd
@@ -24,7 +24,7 @@ RDEPEND="dev-python/pyClamd
 	dev-python/netlib
 	dev-python/pywebkitgtk
 	dev-python/tblib
-	dev-python/ordereddict
+	dev-python/ruamel-ordereddict
 	dev-python/vulndb
 	>=dev-python/fpconst-0.7.2
 	=app-text/pdfminer-20131113
@@ -75,7 +75,7 @@ src_prepare(){
 src_install() {
 	insinto /usr/$(get_libdir)/w3af
 	doins -r w3af profiles scripts tools w3af_console
-	if use gtk ; then 
+	if use gtk ; then
 		doins w3af_gui
 		fperms +x /usr/$(get_libdir)/w3af/w3af_gui || die
 	fi