diff --git a/metadata/md5-cache/sys-devel/autoconf-wrapper-13 b/metadata/md5-cache/sys-devel/autoconf-wrapper-13
deleted file mode 100644
index 22979a6..0000000
--- a/metadata/md5-cache/sys-devel/autoconf-wrapper-13
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=wrapper for autoconf to manage multiple autoconf versions
-EAPI=0
-HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	f783d68a26b62d6b19e070e6bcada5e6
-_md5_=eee5ca6cdefda62049777b57a0b0597e
diff --git a/metadata/md5-cache/sys-devel/autoconf-wrapper-15 b/metadata/md5-cache/sys-devel/autoconf-wrapper-15
new file mode 100644
index 0000000..9180f81
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/autoconf-wrapper-15
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install
+DESCRIPTION=wrapper for autoconf to manage multiple autoconf versions
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=*
+LICENSE=GPL-2
+SLOT=0
+_md5_=3757abdb3ed1ad6d45b22a697ab1ce0b
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
deleted file mode 100644
index 88885ff..0000000
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild,v 1.11 2013/08/10 12:50:26 ago Exp $
-
-inherit multilib
-
-DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-S=${WORKDIR}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/misc
-	newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die
-
-	dodir /usr/bin
-	local x=
-	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
-		dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} || die
-	done
-}
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-15.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-15.ebuild
new file mode 100644
index 0000000..64cae69
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-15.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_pre* ]] || \
+KEYWORDS="*"
+
+S="${WORKDIR}"
+
+src_install() {
+	exeinto /usr/$(get_libdir)/misc
+	newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh
+
+	dodir /usr/bin
+	local x=
+	for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
+		dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x}
+	done
+}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh
old mode 100755
new mode 100644
similarity index 93%
rename from sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
rename to sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh
index 9d07d35..4af2263
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
-# Copyright 1999-2013 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/autoconf-wrapper/files/ac-wrapper-13.sh,v 1.1 2013/04/16 18:48:33 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -79,7 +78,9 @@
 # Set up bindings between actual version and WANT_AUTOCONF;
 # Start at last known unstable/stable versions to speed up lookup process.
 #
-KNOWN_AUTOCONF="2.69:2.5 2.68:2.5"
+if [ -z "${KNOWN_AUTOCONF}" ] ; then
+	KNOWN_AUTOCONF="2.71:2.5 2.70:2.5 2.69:2.5"
+fi
 vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
 
 binary=""
@@ -153,10 +154,10 @@
 
 if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
 	# Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
-	# is set to an older version, let's do some sanity checks.
+	# is set to an older version, let's do some basic checks.
 	case "${WANT_AUTOMAKE}" in
 	1.[456])
-		acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
+		acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null)
 		[ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
 
 		[ -z "${confversion}" ] && [ -r "configure" ] \
diff --git a/sys-devel/autoconf-wrapper/metadata.xml b/sys-devel/autoconf-wrapper/metadata.xml
index 96a2d58..73dda14 100644
--- a/sys-devel/autoconf-wrapper/metadata.xml
+++ b/sys-devel/autoconf-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>