diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-10 b/metadata/md5-cache/sys-devel/automake-wrapper-10
deleted file mode 100644
index 4c22914..0000000
--- a/metadata/md5-cache/sys-devel/automake-wrapper-10
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=wrapper for automake to manage multiple automake versions
-EAPI=4
-HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-_md5_=ff660cb0bc074df805d944a8139c399b
diff --git a/metadata/md5-cache/sys-devel/automake-wrapper-11 b/metadata/md5-cache/sys-devel/automake-wrapper-11
new file mode 100644
index 0000000..5a6e997
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/automake-wrapper-11
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=wrapper for automake to manage multiple automake versions
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=*
+LICENSE=GPL-2
+SLOT=0
+_md5_=9d49bc4646682a529548dcc17e594cab
diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
similarity index 73%
rename from sys-devel/automake-wrapper/automake-wrapper-10.ebuild
rename to sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index d985d2f..2ee4d13 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-10.ebuild,v 1.1 2015/01/07 21:24:41 polynomial-c Exp $
 
-EAPI=4
+EAPI="6"
 
 DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="http://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -20,6 +19,8 @@
 }
 
 src_prepare() {
+	default
+
 	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
 	if use prefix ; then
 		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' \
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-10.sh b/sys-devel/automake-wrapper/files/am-wrapper-11.sh
similarity index 95%
rename from sys-devel/automake-wrapper/files/am-wrapper-10.sh
rename to sys-devel/automake-wrapper/files/am-wrapper-11.sh
index 84cdc4d..2907626 100644
--- a/sys-devel/automake-wrapper/files/am-wrapper-10.sh
+++ b/sys-devel/automake-wrapper/files/am-wrapper-11.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-10.sh,v 1.1 2015/01/07 21:24:41 polynomial-c Exp $
 
 # Executes the correct automake version.
 #
@@ -71,7 +70,7 @@
 # Set up bindings between actual version and WANT_AUTOMAKE;
 # Start with last known versions to speed up lookup process.
 #
-LAST_KNOWN_AUTOMAKE_VER="15"
+LAST_KNOWN_AUTOMAKE_VER="16"
 vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
 
 #
diff --git a/sys-devel/automake-wrapper/metadata.xml b/sys-devel/automake-wrapper/metadata.xml
index 96a2d58..73dda14 100644
--- a/sys-devel/automake-wrapper/metadata.xml
+++ b/sys-devel/automake-wrapper/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>