diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index 0d4b08748..a219b947e 100644
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -1,4 +1,4 @@
 AUX w3af 37 RMD160 ba77819fa632e1e32001d7042d1922b69f68e6d0 SHA1 47e9945bddeda0a9f15b084fbfb3b728ba85cba2 SHA256 106bd9a98bc26fe5ba15d11d5ab7f40795b97d346c169c7b3379518e3da9d7fe
 AUX w3af_console 45 RMD160 0090458f417ae79f17afbfb281d6f83532f89843 SHA1 c8e598281327f733a5e7bb3004b340e93e362dd8 SHA256 baec5ace41ba0ff29b792dd288ee9a14eef83546af633620125644ad29fd19c7
 AUX w3af_gui 41 RMD160 ef08894b771089f92271cb57fe508f429b5a2c49 SHA1 0d213bd93b317bc37d1a1f69caea8c24bde69952 SHA256 12f98d26f6c844b74e9d12a4df12ac8430eeb627dd15e8452e37202d254dda69
-EBUILD w3af-9999.ebuild 920 RMD160 221024c89625e7351d49237a6714856880832060 SHA1 a5f8367580cf0d57ea24bc035235c27b196acdb2 SHA256 6e769f48e3bc607708c646b3b7f66e28871a4557623227d2f904c5ea6da8f02c
+EBUILD w3af-9999.ebuild 1509 RMD160 3204da2c02c029f224842d5cd2b92b27b33a8007 SHA1 b61560b47c7c01a495b4072f35bb69f3ffe02f5f SHA256 af54d97f141e298fbc3857ee341d3df036c5dd5af87e22d322824bd234fc5ab9
diff --git a/net-analyzer/w3af/files/w3af b/net-analyzer/w3af/files/w3af
deleted file mode 100644
index 8b0a19343..000000000
--- a/net-analyzer/w3af/files/w3af
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/lib/w3af
-./w3af $*
diff --git a/net-analyzer/w3af/w3af-9999.ebuild b/net-analyzer/w3af/w3af-9999.ebuild
index 29e6856fc..6883af6a6 100644
--- a/net-analyzer/w3af/w3af-9999.ebuild
+++ b/net-analyzer/w3af/w3af-9999.ebuild
@@ -1,42 +1,56 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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 $
 
 EAPI=2
 
-inherit distutils subversion
+PYTHON_USE_WITH="sqlite"
+PYTHON_DEPEND="2"
 
+inherit multilib python versionator subversion
+
+MY_P=${PN}-"$(replace_version_separator 2 '-')"
 DESCRIPTION="Web Application Attack and Audit Framework"
 HOMEPAGE="http://w3af.sourceforge.net/"
 ESVN_REPO_URI="https://w3af.svn.sourceforge.net/svnroot/w3af/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="+gtk"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk"
 
-DEPEND=""
 RDEPEND=">=dev-python/fpconst-0.7.2
-	 dev-python/pygoogle-ajax
-	 dev-python/pyPdf
-	 dev-python/utidylib
-	 dev-python/soappy
-	 dev-python/beautifulsoup
-	 dev-python/pyopenssl
-	 net-analyzer/scapy
-	 gtk? ( dev-python/pygtk )"
+	dev-python/nltk
+	dev-python/pyopenssl
+	dev-python/pyPdf
+	dev-python/pysqlite
+	dev-python/python-cluster
+	dev-python/pyyaml
+	dev-python/simplejson
+	dev-python/soappy
+	net-analyzer/scapy
+	dev-python/lxml
+	gtk? ( dev-python/pygraphviz
+		>dev-python/pygtk-2.0 )"
 
-src_compile() {
-	einfo "Nothing to compile"
+S=${WORKDIR}/${PN}
+
+src_prepare(){
+	rm -r extlib/{cluster,fpconst-0.7.2,nltk,nltk_contrib,pyPdf,scapy,simplejson,SOAPpy,yaml} || die
+	rm readme/{GPL,INSTALL} || die
 }
 
 src_install() {
-	dodir /usr/lib/
-	# should be as simple as copying everything into the target...
-	cp -pPR "${S}" "${D}"usr/lib/w3af || die
-	if use gtk; then
-		dobin "${FILESDIR}"/w3af_gui
+	insinto /usr/$(get_libdir)/w3af
+	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die
+	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 readme/* || die
 	fi
-	dobin "${FILESDIR}"/w3af_console
-	chown -R root:0 "${D}"
 }