diff --git a/metadata/layout.conf b/metadata/layout.conf
index 34021ae26..68fd7a1d9 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # For details on this file, see the layout.conf section of the
@@ -6,10 +6,14 @@
 
 masters = gentoo
 
-# Use new hashes
-# https://archives.gentoo.org/gentoo-dev-announce/message/a15cbea85dd089c99302f949b4072c20
-# https://wiki.gentoo.org/wiki/GLEP:59
-manifest-hashes = SHA256 SHA512 WHIRLPOOL
+# manifest-hashes specify hashes used for new/updated entries
+# https://archives.gentoo.org/gentoo-dev/message/ba2e5d9666ebd7e1bff1143485a37856
+manifest-hashes = BLAKE2B SHA512
+
+# The following hashes are required on all Manifest entries. If any
+# of them are missing, repoman will refetch and rehash old distfiles.
+# Otherwise, old distfiles will keep using their current hash set.
+manifest-required-hashes = SHA512
 
 # Ebuilds with the specified EAPIs are banned/deprecated
 eapis-banned = 0 1 2 3 4 5