diff --git a/metadata/layout.conf b/metadata/layout.conf
index ce7be41..9e53d0e 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -1,27 +1,28 @@
+# Copyright 1999-2016 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
+# portage(5) man page.
+
 # we inerhit eclasses from gentoo
 masters = gentoo
 
 # This went live Wednesday, July 4, 2012 at 10:00 UTC
-# For more details, please see: http://archives.gentoo.org/gentoo-dev-announce/msg_00000.xml
-# and/or GLEP 59.
+# https://archives.gentoo.org/gentoo-dev-announce/message/a15cbea85dd089c99302f949b4072c20
+# https://wiki.gentoo.org/wiki/GLEP:59
 manifest-hashes = SHA256 SHA512 WHIRLPOOL
 
 # Bug #470670 - gentoo's council says to deprecate EAPIs 1 and 2.
 # 2014-02-25 council meeting deprecated EAPIs 0 and 3.
 # 2015-10-11 council meeting deprecated EAPI 4.
+#eapis-banned = 1
 eapis-deprecated = 0 1 2 3 4
 
 # Bug #337853 - gentoo's council says to enable
 # --echangelog by default for the "gentoo" repo
-# we don't do it, use git log instead.
+# INFRA NOTE 2015/08/08: No more old ChangeLogs in Git
 update-changelog = false
 
-# Use thin manifests
-thin-manifests = true
-
-# Dont sign thin manifests. There is no current policy for git commit signing
-sign-manifests = false
-
 # the default *is* actually pms, but better safe then sorry
 # since we don't actually need stuff like package.* as
 # directory
@@ -33,3 +34,11 @@ profile-formats = pms
 # INFRA NOTE: Format 'pms' was removed on Aug 6 2012. (Announced prior as Aug 1
 # 2012 was the removal date)
 cache-formats = md5-dict
+
+# Use thin Manifests for Git
+thin-manifests = true
+
+# Sign Git commits, and NOT Manifests
+# but sign neither here
+sign-commits = false
+sign-manifests = false