diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index 363f5fb48..fb8322d7e 100644
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -1,3 +1,6 @@
+AUX disable_dependency_check 861 SHA256 dd10e5f302d9cfb0796d01d8a77fa367abd834f7c7da88409390c3171ee31216 SHA512 76ea7fbacd50ec77a3f71a447744af788c707dd7b124cdd9a92e897055ec2a04af38afedc2492ccf06435c9f056ba19e77b96ca590096e05170f39216d973301 WHIRLPOOL b7223b4b100aeed8f5836b1e963232c63e57088df1327ab15b27c8ef7a321f6c7c05efc0081e5c81008baad2ee0b319c78ffd1256cd3dd5bc1d015aeb4e7d984
 AUX w3af_console 45 SHA256 baec5ace41ba0ff29b792dd288ee9a14eef83546af633620125644ad29fd19c7 SHA512 e8353393663d892f0f362a03e9459383cb8cf2de87a4bdd135f6c7fbc289cc34a236abf514dcfb9d9a3c573e2e5747c06c819527b1b0051c9513130cd0047a21 WHIRLPOOL 4b61760caf06b8df3cf1fb3d220c990efc72ea1de1f03ebe875e75f71904037006de6e3470f30f9607c6343ff0130b08622523a34bac822ddc084f43a6b0137f
 AUX w3af_gui 41 SHA256 12f98d26f6c844b74e9d12a4df12ac8430eeb627dd15e8452e37202d254dda69 SHA512 1fd52f555d9fe3ebf7c8a985d83e7f86eb6e9a379589c50c567ed12c54abb63125ccd21b028215a87acb533aa45ec8fd8dc3169a3c9cbe090b8d32f2a9b751ca WHIRLPOOL af264d9b03b34c97a09ff7bafe44f041b07a044bdd47ece3095353c1155bbf57c5cf055f0a0e8d1c8242ed4270ba1822ae264fb0c1f4d987e81713184810f29c
-EBUILD w3af-9999.ebuild 2492 SHA256 9a8d0f13f26e59d6cc8115129ca4593ca198739bf8bc289fa394eb59cfbe3de5 SHA512 5df2faf46c60332f520447d1e8bced56126164ef0813b5773bd97d40cc1da8d96ce2547b59109709aeac4f998d06b43b49bd9a05c367110b856d94c523257ad2 WHIRLPOOL 766b5943b1ab564faa68bac390b7a6b1ae1e41a13c5bbf179773549fe0703ade4d582a8a2be9c31fb10122c1f6ac84ef3ab3aae7b8d10558f1deb82b29d797d2
+DIST 1.6.zip 27016044 SHA256 461b1b1ae664d055b8a7cf5765032dca6c77811176891d5baaa1bbb41915acbe SHA512 c42791f9508ef257fa08af7a51caa209ba0d87b6c42d6865274220cb42a438bd0807c88fa3924daaca94704522594df26c7708b20bc074ddd150fbf6ea3d7ce8 WHIRLPOOL 0c2fd4fae7361fe4be3a2889378528e960024816964d5f3d93f0ec7dba6fe47674c4219a9dd0be3004bafb9149269a6e44a4a1664e9064490c4a84169c16171b
+EBUILD w3af-1.6.ebuild 1947 SHA256 da87f6efc9962434df35c387c6401ae94ff255e21a157ba3a1e970c87fda650d SHA512 4d3803468c7c67171a1d9c38bdf3fcac459cae682c8a8b2ec3432bdb0cd9124d924c9c2c4f22184af1cb3658d6c8a967c61ba0fac80ef7e381a94a3ad22f3ce8 WHIRLPOOL a2ff3cb03091d91d65c6a47a1384e6e6302f26f22d7b281615a1632a765d6d2b616456ab1e08f03534581c6fd64d6712d1a8d1ced478506070e865efe8ac3fa1
+EBUILD w3af-9999.ebuild 1994 SHA256 3a1803fcf632a238137747ccd07f9edb33760b8e4008155404a0c5c0b0603af2 SHA512 a3fa0f0ce32156fb238173fc20439ba7efa2a5e641d86040dcee72ac23bf2eb407bcd82579b0294f65b2cf8b338c8e68540955c6d0a5d2b2ff13a62277d4636d WHIRLPOOL 49143ef10b390e5e01f23f76a197df89f4a4e4c61f2ae77819e06a228adba75e71a4c6769dd6067363bc046dba7cae61f3c690c5eebf918b14fc9fdea548101a
diff --git a/net-analyzer/w3af/files/disable_dependency_check b/net-analyzer/w3af/files/disable_dependency_check
new file mode 100644
index 000000000..4d87bcf5d
--- /dev/null
+++ b/net-analyzer/w3af/files/disable_dependency_check
@@ -0,0 +1,23 @@
+--- w3af/core/controllers/dependency_check/dependency_check.py	2014-03-31 19:29:26.000000000 +0200
++++ w3af/core/controllers/dependency_check/dependency_check.py	2014-04-03 14:44:42.000000000 +0200
+@@ -56,6 +56,7 @@
+     verify_python_version()
+     
+     disable_warnings()
++    return True
+     
+     #
+     #    Check for missing python modules
+
+--- w3af/core/ui/gui/dependency_check/dependency_check.py.orig	2014-05-13 20:49:36.000000000 +0800
++++ w3af/core/ui/gui/dependency_check/dependency_check.py	2014-05-13 21:00:19.319564753 +0800
+@@ -40,6 +40,9 @@
+     we extend() the lists present in the base module before passing them to
+     mdep_check() 
+     """
++
++    return True
++
+     should_exit = mdep_check(pip_packages=PIP_PACKAGES,
+                              system_packages=SYSTEM_PACKAGES,
+                              system_name=SYSTEM_NAME,
diff --git a/net-analyzer/w3af/w3af-1.6.ebuild b/net-analyzer/w3af/w3af-1.6.ebuild
new file mode 100644
index 000000000..9bc404f0a
--- /dev/null
+++ b/net-analyzer/w3af/w3af-1.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: blshkv Exp $
+
+EAPI=5
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib python-r1
+
+DESCRIPTION="Web Application Attack and Audit Framework"
+HOMEPAGE="http://w3af.sourceforge.net/"
+SRC_URI="https://github.com/andresriancho/${PN}/archive/${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk clamav"
+
+RDEPEND=">=dev-python/fpconst-0.7.2
+	=app-text/pdfminer-20110515
+	dev-python/chardet
+	clamav? ( dev-python/clamd )
+	dev-python/esmre
+	dev-python/git-python
+	dev-python/esmre
+	dev-python/guess-language
+	dev-python/halberd
+	=dev-python/msgpack-0.2.4
+	=dev-python/nltk-2.0.4
+	dev-python/phply
+	dev-python/pyopenssl
+	dev-python/pysvn
+	dev-python/python-cluster
+	dev-python/python-ntlm
+	=dev-python/PyGithub-1.21.0
+	dev-python/pyyaml
+	dev-python/simplejson
+	dev-python/soappy
+	|| (
+		net-analyzer/gnu-netcat
+		net-analyzer/netcat
+		net-analyzer/netcat6 )
+	>=net-analyzer/scapy-2
+	dev-db/sqlmap
+	dev-python/lxml
+	dev-python/pybloomfiltermmap
+	=dev-python/futures-2.1.5
+	gtk? ( dev-python/pygraphviz
+		>dev-python/pygtk-2.0
+		=dev-python/xdot-0.6
+		dev-python/pygtksourceview )"
+DEPEND=""
+
+src_prepare(){
+	rm doc/{GPL,INSTALL} || die
+	find "${S}" -type d -name .svn -exec rm -R {} +
+	#bundled sqlmap
+	rm -r w3af/plugins/attack/db/sqlmap || die
+	use clamav || rm w3af/plugins/grep/clamav.py
+	#Halberd hmap is also bundled
+	epatch "${FILESDIR}"/disable_dependency_check
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/w3af
+	doins -r w3af profiles scripts tools w3af_console
+	use gtk && doins w3af_gui
+	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die
+	dobin "${FILESDIR}"/w3af_console || die
+	if use gtk ; then
+		dobin "${FILESDIR}"/w3af_gui || die
+	fi
+	#use flag doc is here because doc is bigger than 3 Mb
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/
+		doins -r doc/* || die
+	fi
+}
diff --git a/net-analyzer/w3af/w3af-9999.ebuild b/net-analyzer/w3af/w3af-9999.ebuild
index 0b96a39ca..106f484a4 100644
--- a/net-analyzer/w3af/w3af-9999.ebuild
+++ b/net-analyzer/w3af/w3af-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0_rc3-r2.ebuild,v 1.1 2010/10/27 20:54:28 hwoarang Exp $
+# $Header: blshkv Exp $
 
 EAPI=5
 
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 )
 
-inherit multilib python versionator git-r3
+inherit multilib python-r1 versionator git-r3
 
 MY_P=${PN}-"$(replace_version_separator 2 '-')"
 DESCRIPTION="Web Application Attack and Audit Framework"
@@ -17,45 +17,57 @@ EGIT_REPO_URI="https://github.com/andresriancho/w3af.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc gtk"
+IUSE="doc gtk clamav"
 
 RDEPEND=">=dev-python/fpconst-0.7.2
-	dev-python/nltk
+	=app-text/pdfminer-20110515
+	dev-python/chardet
+	clamav? ( dev-python/clamd )
+	dev-python/esmre
+	dev-python/git-python
+	dev-python/esmre
+	dev-python/guess-language
+	dev-python/halberd
+	=dev-python/msgpack-0.2.4
+	=dev-python/nltk-2.0.4
+	dev-python/phply
 	dev-python/pyopenssl
 	dev-python/pysvn
 	dev-python/python-cluster
+	dev-python/python-ntlm
+	=dev-python/PyGithub-1.21.0
 	dev-python/pyyaml
 	dev-python/simplejson
 	dev-python/soappy
+	|| (
+		net-analyzer/gnu-netcat
+		net-analyzer/netcat
+		net-analyzer/netcat6 )
 	>=net-analyzer/scapy-2
+	dev-db/sqlmap
 	dev-python/lxml
 	dev-python/pybloomfiltermmap
+	=dev-python/futures-2.1.5
 	gtk? ( dev-python/pygraphviz
 		>dev-python/pygtk-2.0
+		=dev-python/xdot-0.6
 		dev-python/pygtksourceview )"
 DEPEND=""
 
-#w3af bundles sqlmap, how marvelous
-
-QA_PREBUILT="usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/32/lib_mysqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/64/lib_mysqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
-		usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so"
-
 src_prepare(){
 	rm doc/{GPL,INSTALL} || die
+	find "${S}" -type d -name .svn -exec rm -R {} +
+	#bundled sqlmap
+	rm -r w3af/plugins/attack/db/sqlmap || die
+	use clamav || rm w3af/plugins/grep/clamav.py
+	#Halberd hmap is also bundled
+	epatch "${FILESDIR}"/disable_dependency_check
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/w3af
-	doins -r core locales plugins profiles scripts tools w3af_console || die
-	use gtk && doins w3af_gui || die
+	doins -r w3af profiles scripts tools w3af_console
+	use gtk && doins w3af_gui
 	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die
 	dobin "${FILESDIR}"/w3af_console || die
 	if use gtk ; then