diff --git a/documentation/static/pgpkeys/rlibby.key b/documentation/static/pgpkeys/rlibby.key
index 53dbe0c9a6..129b88cf74 100644
--- a/documentation/static/pgpkeys/rlibby.key
+++ b/documentation/static/pgpkeys/rlibby.key
@@ -1,76 +1,115 @@
-// $FreeBSD: head/share/pgpkeys/rlibby.key 50365 2017-06-13 23:00:10Z rlibby $
-//
 // sh addkey.sh rlibby A20FFBBFDF35FD57 ;
 
-
 [.literal-block-margin]
 ....
-pub   2048R/A20FFBBFDF35FD57 2016-07-11 [expires: 2020-06-12]
+pub   rsa2048/A20FFBBFDF35FD57 2016-07-11 [SC] [expires: 2022-09-02]
       Key fingerprint = 9849 809F 64AD 4250 32BF  7975 A20F FBBF DF35 FD57
-uid                          Ryan Libby <rlibby@gmail.com>
-uid                          Ryan Libby <rlibby@FreeBSD.org>
-sub   2048R/7D8F4693B660FE97 2016-07-11
+uid                            Ryan Libby <rlibby@gmail.com>
+uid                            Ryan Libby <rlibby@FreeBSD.org>
+sub   rsa2048/7D8F4693B660FE97 2016-07-11 [E]
       Key fingerprint = E70A 9C90 A595 62F9 2AC8  E503 7D8F 4693 B660 FE97
-sub   2048R/2354FB7E60023CBC 2017-06-12 [expires: 2020-06-11]
+sub   rsa2048/2354FB7E60023CBC 2017-06-12 [S] [expires: 2022-09-02]
       Key fingerprint = 77CD 6F72 4EA8 89DC 3ADE  2FD1 2354 FB7E 6002 3CBC
 
 ....
 
 [.literal-block-margin]
 ....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
-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
-=xwj5
+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
+lA==
+=WoEn
 -----END PGP PUBLIC KEY BLOCK-----
 ....
-