diff --git a/metadata/md5-cache/sys-apps/which-2.20-r1 b/metadata/md5-cache/sys-apps/which-2.21
similarity index 61%
rename from metadata/md5-cache/sys-apps/which-2.20-r1
rename to metadata/md5-cache/sys-apps/which-2.21
index ac671c2..920a678 100644
--- a/metadata/md5-cache/sys-apps/which-2.20-r1
+++ b/metadata/md5-cache/sys-apps/which-2.21
@@ -1,10 +1,10 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure
 DESCRIPTION=Prints out location of specified executables that are in your path
-EAPI=4
-HOMEPAGE=http://www.xs4all.nl/~carlo17/which/
+EAPI=6
+HOMEPAGE=https://carlowood.github.io/which/
 KEYWORDS=*
 LICENSE=GPL-3
 SLOT=0
-SRC_URI=http://www.xs4all.nl/~carlo17/which/which-2.20.tar.gz
+SRC_URI=https://carlowood.github.io/which/which-2.21.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e8227a1f50da30287918621f06ef8004
+_md5_=1d59c4efc20cf2c35dc81cc3e2c2bbcd
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 6c30353..6b3a8cd 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1 +1 @@
-DIST which-2.20.tar.gz 135372 SHA256 d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8 SHA512 29445cd6072814d3a6179b53b8f9e7e3fc8a27b77315f2a04171e177397b91ff80a97db8806fc6b1f08dab8cbca6f208d9d7845858268b121b3af396a4a9062e WHIRLPOOL 35ca3dfc47e6112a2827188b979bc19d369f69f5841dca445039036e6fa5423b0e4e9efddd370f92da16a3873523bf37f7bdf68b748fc78e5b7991290875c49d
+DIST which-2.21.tar.gz 149305 SHA256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 WHIRLPOOL e1712d2f2b48467300f5947d0a72c0cf759bc33001661ba41cd57cefe21cb9974cc318748d76ff73c71fb869c4d7a445973ad95777ab380f673c85095360fd57
diff --git a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-apps/which/metadata.xml
+++ b/sys-apps/which/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>
diff --git a/sys-apps/which/which-2.20-r1.ebuild b/sys-apps/which/which-2.20-r1.ebuild
deleted file mode 100644
index 2ac66c2..0000000
--- a/sys-apps/which/which-2.20-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.20-r1.ebuild,v 1.15 2014/01/26 12:19:19 ago Exp $
-
-EAPI="4"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Prints out location of specified executables that are in your path"
-HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
-SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="*"
-IUSE=""
-
-src_prepare() {
-	append-lfs-flags
-}
-
-src_configure() {
-	tc-export AR
-	default
-}
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
new file mode 100644
index 0000000..dacb33e
--- /dev/null
+++ b/sys-apps/which/which-2.21.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Prints out location of specified executables that are in your path"
+HOMEPAGE="https://carlowood.github.io/which/"
+SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+src_configure() {
+	append-lfs-flags
+	tc-export AR
+	default
+}