diff --git a/app-fuzz/Peach/Manifest b/app-fuzz/Peach/Manifest
index 37e937ce9..216c9ea74 100644
--- a/app-fuzz/Peach/Manifest
+++ b/app-fuzz/Peach/Manifest
@@ -1 +1 @@
-DIST Peach-1.0.zip 4121724 SHA256 5077af651c77532a053be30b0093bade3811502478b639c47bf4222e4d1d194b
+DIST Peach-1.0.zip 4121724 SHA256 5077af651c77532a053be30b0093bade3811502478b639c47bf4222e4d1d194b SHA512 463b03b5bc8198d2d5bc1c7b95904245c5afce122fa24337cd492c8cd6bf007fabd0868dd5356a5e372035a389bd960eec0bbb0c84ef9507c35e7e09b61776a3 WHIRLPOOL 43967125fcba2713e8b878d8ad48495b4b52884225a64f54c0083fb1a93ba94fab1c89d85733bc54d14805a95df4770fd2fa0d07d8812d349d56794872176ccf
diff --git a/app-fuzz/Peach/Peach-1.0-r1.ebuild b/app-fuzz/Peach/Peach-1.0-r1.ebuild
new file mode 100644
index 000000000..14474d9f6
--- /dev/null
+++ b/app-fuzz/Peach/Peach-1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 python-utils-r1
+
+DESCRIPTION="A generic fuzzer framework"
+HOMEPAGE="http://peachfuzz.sourceforge.net"
+SRC_URI="mirror://sourceforge/peachfuzz/Peach-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+RDEPEND=""
+
+src_install() {
+	rm samples/*.exe samples/PeachComTest.zip
+
+	python_moduleinto Peach
+	python_domodule Peach/.
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}/
+		doins -r docs/*
+	fi
+
+#	if use examples; then
+#		insinto /opt/${PN}/samples
+#		doins samples/*
+#		insinto /opt/${PN}
+#		doins *.py
+#	fi
+	dodoc README.txt LICENSE.txt
+}
diff --git a/app-fuzz/Peach/Peach-1.0.ebuild b/app-fuzz/Peach/Peach-1.0.ebuild
deleted file mode 100644
index 0616589ba..000000000
--- a/app-fuzz/Peach/Peach-1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /root/portage/app-fuzz/Peach/Peach-0.4.ebuild,v 1.1.1.2 2006/03/13 21:42:50 grimmlin Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-DESCRIPTION="A generic fuzzer framework"
-HOMEPAGE="http://peachfuzz.sourceforge.net"
-SRC_URI="mirror://sourceforge/peachfuzz/Peach-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc examples"
-
-RDEPEND=""
-
-PYTHON_MODNAME="Peach"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	python_get_version
-	rm samples/*.exe samples/PeachComTest.zip
-	mkdir -p "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PYTHON_MODNAME}/
-	cp -a ${PN}/* "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/${PYTHON_MODNAME}/
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}/
-		doins -r docs/*
-	fi
-	if use examples; then
-		insinto /opt/${PN}/samples
-		doins samples/*
-		insinto /opt/${PN}
-		doins *.py
-	fi
-	dodoc README.txt LICENSE.txt
-}
diff --git a/app-fuzz/Peach/files/digest-Peach-0.4 b/app-fuzz/Peach/files/digest-Peach-0.4
deleted file mode 100644
index c227d5735..000000000
--- a/app-fuzz/Peach/files/digest-Peach-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 976d2e19fcf0c29294f284f2331d1211 Peach-0.4.zip 2666734
-RMD160 a6e452e120e04fb5b5f78896936505800ea18c2f Peach-0.4.zip 2666734
-SHA256 9767275bafc1d5c3f168ded3e092a109e4bdddf11ee7bfae3025b087e7bae4ab Peach-0.4.zip 2666734
diff --git a/app-fuzz/smudge/Manifest b/app-fuzz/smudge/Manifest
index 900cdd662..7a6d68375 100644
--- a/app-fuzz/smudge/Manifest
+++ b/app-fuzz/smudge/Manifest
@@ -1 +1 @@
-DIST smudge.tar.gz 31350 SHA256 07ad91a612c6a33b614002efa14632bf44d0b6986448c22dfed97fb2102dc23b
+DIST smudge.tar.gz 31350 SHA256 07ad91a612c6a33b614002efa14632bf44d0b6986448c22dfed97fb2102dc23b SHA512 a0bd0192bf6e196e17a43fc2e8510051a11018fd0484d5a89d4eabeb5eab9a464d01947f7b77750d46d357d0259222bcb143dc5fd4508878c2f01c208c7cb983 WHIRLPOOL 80840b8494b6ab9488a0730b54ebf563d6c581245d634afa8a22a497d592e3ad94a6aac1a512f5109883a9a01b780f0e87776064524cbb96f8d9971e2ae9f689
diff --git a/app-fuzz/smudge/smudge-0.8-r1.ebuild b/app-fuzz/smudge/smudge-0.8-r2.ebuild
similarity index 52%
rename from app-fuzz/smudge/smudge-0.8-r1.ebuild
rename to app-fuzz/smudge/smudge-0.8-r2.ebuild
index 6ac7d83ce..4a67f95b7 100644
--- a/app-fuzz/smudge/smudge-0.8-r1.ebuild
+++ b/app-fuzz/smudge/smudge-0.8-r2.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /root/portage/app-fuzz/smudge/smudge-0.8.ebuild,v 1.1.1.1 2006/03/13 21:06:24 grimmlin Exp $
 
-EAPI=4
+EAPI=6
 
-PYTHON_DEPEND="2"
-
-inherit distutils
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 python-utils-r1
 
 DESCRIPTION="Smudge is basically a port of SPIKE into python scripts"
 HOMEPAGE="http://www.pentoo.ch/"
@@ -14,7 +12,7 @@ SRC_URI="http://dev.pentoo.ch/~grimmlin/distfiles/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+#KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND=""
@@ -22,16 +20,9 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${PN}
 
-PYTHON_MODNAME="SMUDGE"
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
 src_install() {
-	# also install smudge as a importable python module
-	insinto /usr/$(get_libdir)/python$(python_get_version)/site-packages/
-	doins *.py
+	python_moduleinto smudge
+	python_domodule *.py
 
 	insinto /opt/smudge/
 	dodir /opt/smudge/logs/
@@ -40,14 +31,8 @@ src_install() {
 	insopts -m0644
 	insinto /opt/smudge/misc
 	doins -r misc/*
+
 	dosbin "${FILESDIR}"/${PN}
 	dodoc COPYING.txt CHANGELOG.txt README.txt
+
 	}
-
-pkg_postinst() {
-	python_mod_optimize
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}