diff --git a/share/pgpkeys/mckusick.key b/share/pgpkeys/mckusick.key
new file mode 100644
index 0000000000..704493033a
--- /dev/null
+++ b/share/pgpkeys/mckusick.key
@@ -0,0 +1,51 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh mckusick CAB83758086F2431 ;
+-->
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+pub   rsa2048/CAB83758086F2431 2015-10-23
+      Key fingerprint = 56A8 62BC E973 24B7 E787  3F75 CAB8 3758 086F 2431
+uid                            Marshall Kirk McKusick <mckusick@freebsd.org>
+uid                            Marshall Kirk McKusick <mckusick@mckusick.com>
+sub   rsa2048/DD2D6C768B07C96A 2015-10-23
+
+]]></programlisting>
+<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFYqnSsBCACxA1NScC+0cnK6b3WDmEnwTgFh4oXAWM2VEX5CVovcENv+86rA
+fHCJDrklOSOB0KU/tpMT5uQNIPkH2cR71QRhBbkiwg70jIempW8zzvG1VMYF4UrS
+B56zC+pOx2lPH6wrch59lX4p114RmoOCK7kwSbjhNTtpQc7GajMtN7Bo2EG8lNYZ
+4Y+Ku4ZzyrNz1xSlF/XgswiHRbHsOu4Qx12yAQlnbcOfppCG6LAKvTfdKZYe9ERB
+Cm8WqZAWm6RTWtyFtLK/cpfRhoIzRq+TYbC8RsmolPwaseUoc8Hbt+3cMyzjYRBW
+/lENX9bh6T2N01C0DAE0BNKeIzsOYJWi8NUVABEBAAG0Lk1hcnNoYWxsIEtpcmsg
+TWNLdXNpY2sgPG1ja3VzaWNrQG1ja3VzaWNrLmNvbT6JATcEEwEKACEFAlYqnSsC
+GwMFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQyrg3WAhvJDEVvQf+Lit9k51E
+/b7L8qqo3F3kRs2z3bXZrP/SozRre8Wu0Vd0xTiJaE4mt7s4D7Z6XLUWvnju8ZCs
+SeOlO+cjeADTsG5Qhm5Ft6NcsMJ1EgkPN1vLmPmxdFOBzGMb1t9SyTQfE+GgN915
+E3s3pQdCu7Hqz9jw353PmCJ3LiFzrUDSH/Vsesv+xUruGhxurpBaUyf7GOCuL4hI
+05haRvbutOHsJBCzvMWbl74kF1TB5TkkcsdXTClUtejcQepENb3mqu8SfZjNeNeY
+ULGoJz2yjdzG07wTQBJJbilv6rhuoGt6Y5YrDJUtYcQnG0uURaYaUh3sv2sXcVkm
+CMGQgMLRM9ydNrQtTWFyc2hhbGwgS2lyayBNY0t1c2ljayA8bWNrdXNpY2tAZnJl
+ZWJzZC5vcmc+iQE3BBMBCgAhBQJWKp3TAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4B
+AheAAAoJEMq4N1gIbyQx224IAJzrygpG/itn7G/cak/5wOC+xuwywnf2pW928gOn
+fnx/v4w71YVqGy9n+xUoI2dOb+/0sFLZjlyz54iL/W1qh3voEB4imDLEaDxUvWNJ
+XW9DzJlg3Y1jLVbtdirK1SOgvRzKodNz2HUdy+N6btDh0JvY3RnfrZW2HBk5MIfT
+WJwq+duUGZfo+Me/NsWRp8L6ObLSM4rRjrPH+kC848ih1P4xf7S13uXRmx6mlhQN
+5VhsYqbiY5o4dw+SQdQoShHx9Heaak2+5zB9qo1sYFamYzuBnJ1+KfSCDcIoEl99
+bGd+jqgFPR2s0frJ+VRoValGtDT3oX1ksMOuxmpZKzYd/Wu5AQ0EViqdKwEIAOsi
+oeKuJa1RHi/vVHn0jPKwOzt5qn0KrB1KVtsYw6lHg1zRWKGVnoTwKOghoOY7VG6B
+W473AJsNVebZFy2DKmm8iNlyU60j/9Q5nJUJPsFDy/sJJHpXePUpvTcyJ21eEnWk
+tBZQO105IxLbeTyAUv0erP205ywVq1S969EHEDYpY9EPvgmfrjUtDVD68xBiNXv8
+Nfme0QqtqZQLjfTECBW8C5LhqFFgW01f6xL2o4vHGurJoifdXwxIBp8r6B1sj0Sc
+h62KAmbiZG+Hh+qj7ngpT2a/tzA61HGoXMgFKIE+YlCy6717Id4gfzWLi5R21a7J
+Htzxxgb2LzwqyQUAimUAEQEAAYkBHwQYAQoACQUCViqdKwIbDAAKCRDKuDdYCG8k
+MVV9B/47AbYFxdbUKto6FPWpzMQnU0QMt14fugDJEQ9fk2LZGww8pGUrBqn+u/HU
+WRRRF1fSqlwyCu6Wd3x2/oVOPGYPESpM0VQabquLL7OifDAr6vVaN3a31i/7E4XK
+7EIjk+TENFTIY7PA6t1AcGihRWJcQYlNzntIqsU0Au4JnAzwgC+PskH/o+rL7zkR
+00KNA4awhn/rQ5BH2zrQT6uDIiU+UQSkz/kAs+e/39ldZ2I6OWj9LDxPZQOzyeYx
+Cna+2+AKHCXKDeLI9zgaDaebI7SuGSJqcLQNB0WJZ25OCdPgtPAX/DwEFMXEo0Ar
+UY0zb05hHf3AKMnjjACPOZlAcUS1
+=UaES
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.xml b/share/pgpkeys/pgpkeys-developers.xml
index f571ef5627..c3c12644c5 100644
--- a/share/pgpkeys/pgpkeys-developers.xml
+++ b/share/pgpkeys/pgpkeys-developers.xml
@@ -1346,16 +1346,21 @@
       &pgpkey.slm;
     </sect2>
 
-    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-tmclaugh">
-      <title>&a.tmclaugh.email;</title>
-      &pgpkey.tmclaugh;
-    </sect2>
-
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-mckay">
       <title>&a.mckay.email;</title>
       &pgpkey.mckay;
     </sect2>
 
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-mckusick">
+      <title>&a.mckusick.email;</title>
+      &pgpkey.mckusick;
+    </sect2>
+
+    <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-tmclaugh">
+      <title>&a.tmclaugh.email;</title>
+      &pgpkey.tmclaugh;
+    </sect2>
+
     <sect2 xmlns="http://docbook.org/ns/docbook" xml:id="pgpkey-xmj">
       <title>&a.xmj.email;</title>
       &pgpkey.xmj;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 86168d5f8f..80a15faf86 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -294,6 +294,7 @@
 <!ENTITY pgpkey.maxim SYSTEM "maxim.key">
 <!ENTITY pgpkey.mbr SYSTEM "mbr.key">
 <!ENTITY pgpkey.mckay SYSTEM "mckay.key">
+<!ENTITY pgpkey.mckusick SYSTEM "mckusick.key">
 <!ENTITY pgpkey.mdf SYSTEM "mdf.key">
 <!ENTITY pgpkey.melifaro SYSTEM "melifaro.key">
 <!ENTITY pgpkey.metal SYSTEM "metal.key">