diff --git a/app-crypt/md6sum/files/md6sum-1.0-cflags.patch b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
index 18e1937c44240..b0bf8f01a3273 100644
--- a/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
+++ b/app-crypt/md6sum/files/md6sum-1.0-cflags.patch
@@ -1,5 +1,5 @@
---- Makefile.in	2012-11-07 22:04:51.207982344 -0500
-+++ Makefile.in.new	2012-11-07 22:06:00.905977580 -0500
+--- a/Makefile.in	2012-11-07 22:04:51.207982344 -0500
++++ b/Makefile.in	2012-11-07 22:06:00.905977580 -0500
 @@ -18,19 +18,19 @@
  all: md6sum
  
diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
index 446e21a7c2ab6..9a8c035876125 100644
--- a/app-crypt/md6sum/md6sum-1.0-r2.ebuild
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils
 
@@ -15,13 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ldflags.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
-	epatch "${FILESDIR}/${P}-format-security.patch"
-}
-
-src_install() {
-	default
-	newdoc README_Reference.txt README
-}
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-cflags.patch"
+	"${FILESDIR}/${P}-format-security.patch"
+)