diff --git a/app-fuzz/fusil/Manifest b/app-fuzz/fusil/Manifest
index 17c41e236..fa83e1856 100644
--- a/app-fuzz/fusil/Manifest
+++ b/app-fuzz/fusil/Manifest
@@ -1,2 +1,2 @@
-DIST fusil-1.0beta3.tar.gz 123843 RMD160 6c62e1a4f3a4b85c090bc5f1df025655fbabebd7 SHA1 04005491b809300c3542759f39287cce836c2c05 SHA256 d4cf0493ed648ce4af031f4d832cb865029915c07c10cdf47985fb64576036e4
-EBUILD fusil-1.0_beta3.ebuild 585 RMD160 d2ec3952bf42cea2c9892446bbca7976c721e530 SHA1 3759325e14f0fb7709b9c645a770bf32364f423e SHA256 508cbf5d3ce258c4cf10fb257f52a438e7e4abdccf0789d26bd919b963eab171
+DIST fusil-1.1.tar.gz 142321 RMD160 cedf549d0d45b6c8bb19b9ddddde232ff0406560 SHA1 d40f8720d0c599c92fc38bc0c36525de427cfda8 SHA256 85f9a52578c9af3d2a062097144cb6dc507fff7df7e286479010e65cf6b6f23d
+EBUILD fusil-1.1.ebuild 622 RMD160 6e079260964ee0659bc50da9f64e3e289195cf89 SHA1 38fdeac65b27ef751a81e6fd17ed93df682d3940 SHA256 6cbfc590a16ea2cbefe9190bd196db0552c012d462dd872b3b105abc431e1af9
diff --git a/app-fuzz/fusil/fusil-1.0_beta3.ebuild b/app-fuzz/fusil/fusil-1.0_beta3.ebuild
deleted file mode 100644
index b4d3eaee1..000000000
--- a/app-fuzz/fusil/fusil-1.0_beta3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-MY_PV=${PV/_/}
-
-DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs"
-HOMEPAGE="http://fusil.hachoir.org/"
-SRC_URI="http://pypi.python.org/packages/source/f/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/python-ptrace-0.4.2
-	dev-python/ctypes
-	dev-python/python-xlib"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PYTHON_MODNAME="fusil"
diff --git a/app-fuzz/fusil/fusil-1.1.ebuild b/app-fuzz/fusil/fusil-1.1.ebuild
new file mode 100644
index 000000000..3652af3c4
--- /dev/null
+++ b/app-fuzz/fusil/fusil-1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+ 
+NEED_PYTHON=2.4
+ 
+inherit distutils
+ 
+DESCRIPTION="Fusil the fuzzer is a Python library used to write fuzzing programs."
+HOMEPAGE="http://fusil.hachoir.org/"
+SRC_URI="http://pypi.python.org/packages/source/f/fusil/${P}.tar.gz"
+ 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+ 
+DEPEND="|| ( ( =dev-lang/python-2.4* dev-python/ctypes ) >=dev-lang/python-2.5 )"
+RDEPEND="dev-python/python-ptrace"
+ 
+PYTHON_MODNAME="fusil"
+
+pkg_postinst() {
+	enewgroup fusil
+	enewuser fusil -1 -1 -1 "fusil"
+}
diff --git a/dev-python/python-ptrace/Manifest b/dev-python/python-ptrace/Manifest
index 7a49f1576..92daf9ab3 100644
--- a/dev-python/python-ptrace/Manifest
+++ b/dev-python/python-ptrace/Manifest
@@ -1,2 +1,2 @@
-DIST python-ptrace-0.4.2.tar.gz 68280 RMD160 a67ef2d10efb60478b343a48aaa204372906749c SHA1 d40d45c417a622e47222eed1d245f030d70f9289 SHA256 ece9e442c16fcd26f5b4daa40a91c952e54278e7dfb6b4d179b35e23a3885945
-EBUILD python-ptrace-0.4.2.ebuild 464 RMD160 0fcedeb5594816a820db7d783639a0c173b85ca7 SHA1 d28d732796e47f00d02c9ab5d616dbc1441d1f14 SHA256 d1d9aceb217f0cbb3e6f166a240995d1a54881464c4f991655c49185a5e1e8ec
+DIST python-ptrace-0.5.tar.gz 77440 RMD160 16b587e83aa93005fda99827c0605497622f612e SHA1 b46d102c6e274073bc20acc78a19710d0f8b1c79 SHA256 8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8
+EBUILD python-ptrace-0.5.ebuild 607 RMD160 5169657d8415c0a543fb44ca4729b9cb4ea94df7 SHA1 242584441dea985542ea70bd29ce42716da5b920 SHA256 aa647e7a7b0f016946e40c0eb88c91ad18e041c4bdd51697eabe0d993b60eb82
diff --git a/dev-python/python-ptrace/python-ptrace-0.4.2.ebuild b/dev-python/python-ptrace/python-ptrace-0.4.2.ebuild
deleted file mode 100644
index fc822fec6..000000000
--- a/dev-python/python-ptrace/python-ptrace-0.4.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-
-inherit distutils
-
-DESCRIPTION="a debugger using ptrace written in Python"
-HOMEPAGE="http://python-ptrace.hachoir.org/"
-SRC_URI="http://pypi.python.org/packages/source/p/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/ctypes"
-
-PYTHON_MODNAME="ptrace"
diff --git a/dev-python/python-ptrace/python-ptrace-0.5.ebuild b/dev-python/python-ptrace/python-ptrace-0.5.ebuild
new file mode 100644
index 000000000..77e0ac46d
--- /dev/null
+++ b/dev-python/python-ptrace/python-ptrace-0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:  $
+ 
+NEED_PYTHON=2.4
+ 
+inherit distutils
+ 
+DESCRIPTION="python-ptrace is a debugger using ptrace (Linux, BSD and Darwin system call to trace processes) written in Python."
+HOMEPAGE="http://python-ptrace.hachoir.org/"
+SRC_URI="http://pypi.python.org/packages/source/p/python-ptrace/${P}.tar.gz"
+ 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+ 
+DEPEND="|| ( ( =dev-lang/python-2.4* dev-python/ctypes ) >=dev-lang/python-2.5 )"
+RDEPEND="dev-libs/distorm"
+ 
+PYTHON_MODNAME="ptrace"