diff --git a/sys-devel/automake/automake-1.15-r2.ebuild b/sys-devel/automake/automake-1.15-r2.ebuild
index 9b47c67..24fbb57 100644
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ b/sys-devel/automake/automake-1.15-r2.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="6"
 
-inherit eutils versionator
+inherit versionator
 
 if [[ ${PV/_beta} == ${PV} ]]; then
 	MY_P=${P}
@@ -36,19 +36,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	export WANT_AUTOCONF=2.5
-	epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
-	epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
-}
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
-}
-
-src_compile() {
-	emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
+		  "${FILESDIR}"/${PN}-1.15-mdate-tz.patch ) #520818 #574492
 
 src_test() {
 	emake check
@@ -57,7 +46,7 @@ src_test() {
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${D}"/usr/share/info >/dev/null
+	pushd "${ED}"/usr/share/info >/dev/null
 	rm -f dir
 
 	# Rewrite all the references to other pages.
@@ -84,16 +73,15 @@ slot_info_pages() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install \
-		APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
+	emake DESTDIR="${D}" install
 	slot_info_pages
-	rm "${D}"/usr/share/aclocal/README || die
-	rmdir "${D}"/usr/share/aclocal || die
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 
 	rm \
-		"${D}"/usr/bin/{aclocal,automake} \
-		"${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version