diff --git a/share/pgpkeys/gnn.key b/share/pgpkeys/gnn.key
index 8f9011bd27..b3bcb3f200 100644
--- a/share/pgpkeys/gnn.key
+++ b/share/pgpkeys/gnn.key
@@ -1,11 +1,13 @@
 <!-- $FreeBSD$ -->
 <!--
-sh addkey.sh gnn@neville-neil.com 440A33D2;
+sh addkey.sh gnn 440A33D2;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/440A33D2 2002-09-17 George V. Neville-Neil <gnn@neville-neil.com>
-     Key fingerprint = AF66 410F CC8D 1FC9 17DB  6225 61D8 76C1 440A 33D2
-sub  2048g/95A74F6E 2002-09-17
+pub   1024D/440A33D2 2002-09-17
+      Key fingerprint = AF66 410F CC8D 1FC9 17DB  6225 61D8 76C1 440A 33D2
+uid                  George V. Neville-Neil <gnn@freebsd.org>
+uid                  George V. Neville-Neil <gnn@neville-neil.com>
+sub   2048g/95A74F6E 2002-09-17
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
@@ -21,20 +23,23 @@ UxkBOUszEUPDpXPnMI5RWB+0siQhZl3yX+lUPtASrEj84rpOSXZtNPAkHit/iwva
 pW75gZjt9yN7IhVQVw8O2OMTRGNoWsshzKzznqxNP3p1JYYq/rQtR2VvcmdlIFYu
 IE5ldmlsbGUtTmVpbCA8Z25uQG5ldmlsbGUtbmVpbC5jb20+iFkEExECABkFAj2G
 we4ECwcDAgMVAgMDFgIBAh4BAheAAAoJEGHYdsFECjPS6hUAni/U8Zbrr+TFHLt3
-cLg0VWnWxCI/AKCNqxRmA/HlZLPRzhVCQODgfbOG4LkCDQQ9hsIFEAgAryX6Ain0
-aN8tSZGorCy7UlbKgnhdZpcHwRsrw9C7tFZwxrsvWhxMWnzRG1GlvjkHtGF7WXl+
-9AlDxZ4swXAxLBxI9aQvR6GQkqGF7ajkQWt2SFMM/oyW4xyRK7O1zPxLIYQKJZQt
-eK1yrSu/lFQsOSZApompReywMloKngYpcLSlAaSGl6rn9P6sLPrjopHGW91LbWpk
-BVFtGJeCihz9uHLwjl0pcfCpfZdq0M33nY0D1yPfM5HEd0hI2dO3A7PpkDk2sdjo
-FUtxdpw1BKi0JgIn7RxVkNId0QaRGCxkzXd4F18ST8WXUe2CAZ8bye0WTOahoGX0
-3NCZuGjObPgLNwADBQf9HVQeNBb5O+FOpsByzMBJMx4maFVWTwVDLLqm9xZYGazG
-JsGt6gDzYT4VkjvaS0JTyffZxRY9ZUVFOzjv6IobHSixH09gk+bamunwFqIkkCCg
-QW5K5m0HnXlz1rbyXs0tBWNe6znyvNuNi56vnY0vIoQcUiqQlW8FjtQz5LbuoRs1
-kM/sdgfdY2zHzPf59NMRJGeGdh9HUmTWNliqivjJKgImH+riQbOwWVd/dVlkNX2o
-Aj/03xzzNIA58BX6kiZsScz5t7qU5mIKEkaq4uzR91nnOaWNeW+uyRRzKTBW4Grh
-LIg0oggpOGMR34HuEjHup6DyAgIzejwpCDA5XcYvmYhGBBgRAgAGBQI9hsIFAAoJ
-EGHYdsFECjPSiYAAoMM3xZlAeHYsubE8y1SxN0wqsJyWAJ9/QckJ7/xXixkmP25W
-K1bECmgqQg==
-=VOMx
+cLg0VWnWxCI/AKCNqxRmA/HlZLPRzhVCQODgfbOG4LQoR2VvcmdlIFYuIE5ldmls
+bGUtTmVpbCA8Z25uQGZyZWVic2Qub3JnPohgBBMRAgAgBQJDtkW7AhsjBgsJCAcD
+AgQVAggDBBYCAwECHgECF4AACgkQYdh2wUQKM9LtQACfTi75crWjtxxVJUmGSn2+
+CDnlCesAnRqM+XSv9/KnZ3O/GRtpkNwT9NCJuQINBD2GwgUQCACvJfoCKfRo3y1J
+kaisLLtSVsqCeF1mlwfBGyvD0Lu0VnDGuy9aHExafNEbUaW+OQe0YXtZeX70CUPF
+nizBcDEsHEj1pC9HoZCSoYXtqORBa3ZIUwz+jJbjHJErs7XM/EshhAollC14rXKt
+K7+UVCw5JkCmialF7LAyWgqeBilwtKUBpIaXquf0/qws+uOikcZb3UttamQFUW0Y
+l4KKHP24cvCOXSlx8Kl9l2rQzfedjQPXI98zkcR3SEjZ07cDs+mQOTax2OgVS3F2
+nDUEqLQmAiftHFWQ0h3RBpEYLGTNd3gXXxJPxZdR7YIBnxvJ7RZM5qGgZfTc0Jm4
+aM5s+As3AAMFB/0dVB40Fvk74U6mwHLMwEkzHiZoVVZPBUMsuqb3FlgZrMYmwa3q
+APNhPhWSO9pLQlPJ99nFFj1lRUU7OO/oihsdKLEfT2CT5tqa6fAWoiSQIKBBbkrm
+bQedeXPWtvJezS0FY17rOfK8242Lnq+djS8ihBxSKpCVbwWO1DPktu6hGzWQz+x2
+B91jbMfM9/n00xEkZ4Z2H0dSZNY2WKqK+MkqAiYf6uJBs7BZV391WWQ1fagCP/Tf
+HPM0gDnwFfqSJmxJzPm3upTmYgoSRqri7NH3Wec5pY15b67JFHMpMFbgauEsiDSi
+CCk4YxHfge4SMe6noPICAjN6PCkIMDldxi+ZiEYEGBECAAYFAj2GwgUACgkQYdh2
+wUQKM9KJgACgwzfFmUB4diy5sTzLVLE3TCqwnJYAn39ByQnv/FeLGSY/blYrVsQK
+aCpC
+=SotO
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>