diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20100625 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20100625
deleted file mode 100644
index 55ff7a4..0000000
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20100625
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=an (often faster than gawk) awk-interpreter
-EAPI=2
-HOMEPAGE=http://invisible-island.net/mawk/mawk.html
-KEYWORDS=*
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://invisible-island.net/mawk/mawk-1.3.4-20100625.tgz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c08c7e5a09b1d4934965f6bc64c2c3ea
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503
new file mode 100644
index 0000000..6fa61d5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20150503
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=app-eselect/eselect-awk
+DESCRIPTION=an (often faster than gawk) awk-interpreter
+EAPI=5
+HOMEPAGE=http://invisible-island.net/mawk/mawk.html
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=app-eselect/eselect-awk
+SLOT=0
+SRC_URI=ftp://invisible-island.net/mawk/mawk-1.3.4-20150503.tgz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=807bab79a9141a315de34f182d420373
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 8c06109..82a1d59 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1 +1 @@
-DIST mawk-1.3.4-20100625.tgz 304970 RMD160 eba15ad8ed2d0acefe56b02a6db80ad3d9f87dfa SHA1 5ba79c2af60915ec3a3eb8d2bbd59e15b9c24a79 SHA256 a8837a66ecee746edc149d7c38686209656c455290a1805c5e05ebad3184d2c9
+DIST mawk-1.3.4-20150503.tgz 468794 SHA256 461673c7c4572e1e67e69e7bf7582e02d3c175b814485f2aa52c2c28099b3c6f SHA512 ac9dde6948328d8db94458448abdf7389f8862ae6093315dd19ed9d1cbeab60fca1fc7b084cda4ce09505010f7108612585e3c4ba9663ddf3adb869bf1d9d7b6 WHIRLPOOL 171c82659cfbae255c7209a1ef700a981bebb46ebcfabe37852ef4edfe60f28e6f3b8509700fbdf6edd10af2bdf4a5be898686666f2a61e59c1771b475645a0a
diff --git a/sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch b/sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch
deleted file mode 100644
index 104bb46..0000000
--- a/sys-apps/mawk/files/mawk-1.3.4-cross-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -104,8 +104,9 @@
- 	-@rm -f $@
- 	notangle -R'"array.h"' array.w | $(NOIDENT) | cpif array.h
- 
-+BUILD_CC ?= gcc
- scancode.c :  $(srcdir)/makescan.c  scancode.h nstd.h config.h
--	@ECHO_LD@$(CC) $(CFLAGS) $(CPPFLAGS) -o makescan.exe $(srcdir)/makescan.c
-+	@ECHO_LD@$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) -o makescan.exe $(srcdir)/makescan.c
- 	rm -f scancode.c
- 	./makescan.exe > scancode.c
- 	rm makescan.exe
diff --git a/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild b/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild
deleted file mode 100644
index 39fa4ab..0000000
--- a/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mawk/mawk-1.3.4_p20100625.ebuild,v 1.2 2011/10/20 15:04:10 vapier Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs eutils
-
-MY_P=${P/_p/-}
-DESCRIPTION="an (often faster than gawk) awk-interpreter"
-HOMEPAGE="http://invisible-island.net/mawk/mawk.html"
-SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.3.4-cross-compile.patch
-	tc-export BUILD_CC
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ACKNOWLEDGMENT CHANGES INSTALL README
-
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/*  # avoid compression of dodoc + make executable
-}
diff --git a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
new file mode 100644
index 0000000..e9295bc
--- /dev/null
+++ b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+MY_P=${P/_p/-}
+DESCRIPTION="an (often faster than gawk) awk-interpreter"
+HOMEPAGE="http://invisible-island.net/mawk/mawk.html"
+SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+
+RDEPEND="app-eselect/eselect-awk"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ACKNOWLEDGMENT CHANGES README )
+
+src_prepare() {
+	tc-export BUILD_CC
+}
+
+src_install() {
+	default
+
+	exeinto /usr/share/doc/${PF}/examples
+	doexe examples/*
+	docompress -x /usr/share/doc/${PF}/examples
+}
+
+pkg_postinst() {
+	eselect awk update ifunset
+}
+
+pkg_postrm() {
+	eselect awk update ifunset
+}
diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://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>