diff --git a/share/pgpkeys/will.key b/share/pgpkeys/will.key
index 60ba0675ea..1094c77cf5 100644
--- a/share/pgpkeys/will.key
+++ b/share/pgpkeys/will.key
@@ -1,194 +1,617 @@
+pub 1024D/F81672C5 2000-05-22 Will Andrews (Key for official matters)
Key fingerprint = 661F BBF7 9F5D 3D02 C862 5F6C 178E E274 F816 72C5
-uid Will Andrews (Key for official matters)
uid Will Andrews
uid Will Andrews
+uid Will Andrews
uid Will Andrews
uid Will Andrews
uid Will Andrews
sub 1024g/55472804 2000-05-22
]]>