diff --git a/share/pgpkeys/obraun.key b/share/pgpkeys/obraun.key
index 2b9f2107b4..0e68ceb5c8 100644
--- a/share/pgpkeys/obraun.key
+++ b/share/pgpkeys/obraun.key
@@ -1,54 +1,49 @@
 <!-- $FreeBSD$ -->
 <!--
 sh addkey.sh obraun EF25B1BA;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
 pub  1024D/EF25B1BA 2001-05-06 Oliver Braun <obraun@unsane.org>
      Key fingerprint = 6A3B 042A 732E 17E4 B6E7  3EAF C0B1 6B7D EF25 B1BA
 uid                            Oliver Braun <obraun@informatik.unibw-muenchen.de>
 uid                            Oliver Braun <obraun@obraun.net>
 uid                            Oliver Braun <obraun@freebsd.org>
-uid                            Oliver Braun <obraun@galority.org>
 uid                            Oliver Braun <obraun@unsane.de>
 sub  1024g/09D28582 2001-05-06
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (FreeBSD)
 
 mQGiBDr1p9kRBADrTCmhk/+XY9Jc34z36wp8zy1rbxGBy80enJM+aFPHks/iYPxR
 WA1tB8BEdGPJliUMYcNGeo+ZX3As1+xxo7NJCc7Zd7Gfs1+fMOXPwKGt02mr+Nje
 +nF9XMfdGPP0IcK9lzkVeEdH2JP41pS2SmrMwsTE/eGv9pFEnnmRxeuFcwCg1RYc
 f8freOk8v68+J99mCUUAGl8EANePcxWbRYgH5KulTzE5nYIt9WBn247T7goE3yn1
 R2VddSXXGhs0byRxXpNAcrysyGshIQY0nnZSB5AUt27tZJucoT1p/BtBFQ6hLCQe
 kaIRL0sdXrVJZn3/Q1G7vJWD6wwS35dro5PsYYPDI+qL1tISlWHZNQ2Y6jGdqhc4
 Len0A/4nV78yB7cLvHksxwvbdtVVn8eVo1B2U+/b4cXhevHAl8AmNN+usmEodxxe
 8FYWV8jY323xiYSMrCpYT9FuD3r2qORMOGWpg0zth6BkhdgH1z2i7koKkGIfc4mV
-6oea3ep5uaU82r1sGe7/cVzMGUwzZq9xizwODfbmSW6E+vdAjLQyT2xpdmVyIEJy
-YXVuIDxvYnJhdW5AaW5mb3JtYXRpay51bmlidy1tdWVuY2hlbi5kZT6IVwQTEQIA
-FwULBwoDBAMVAwIDFgIBAheABQI69afbAAoJEMCxa33vJbG6Wt4AoIH7mwhiW9Av
-0s4bQDxjn1Q5OfshAJ0QkLkjUIkKxjEi3UthkpSdHQzk6bQgT2xpdmVyIEJyYXVu
-IDxvYnJhdW5Ab2JyYXVuLm5ldD6IXAQTEQIAHAUCPWNbKgIbAwQLBwMCAxUCAwMW
-AgECHgECF4AACgkQwLFrfe8lsbr9AgCfZVA8yinWgqf/JiY5Vy45UmWmiU4An1yK
-kK+fKeTEhZFXS4S2ytT9ZfBStCFPbGl2ZXIgQnJhdW4gPG9icmF1bkBmcmVlYnNk
-Lm9yZz6IXAQTEQIAHAUCPWNbRQIbAwQLBwMCAxUCAwMWAgECHgECF4AACgkQwLFr
-fe8lsbpBywCfbqD/XCHQV5Xbe130P+cStn1LBz4AnRSEe3CtJdLKTtsY8284aDz1
-UoW6tCJPbGl2ZXIgQnJhdW4gPG9icmF1bkBnYWxvcml0eS5vcmc+iFwEExECABwF
-Aj3bTJICGwMECwcDAgMVAgMDFgIBAh4BAheAAAoJEMCxa33vJbG6gCIAoJ+3j8ds
-1NJg1+KmgRCfEHDWhwa8AJ9L/zfjV3ZYvkZAHo9B0fxx4o0C/bQfT2xpdmVyIEJy
-YXVuIDxvYnJhdW5AdW5zYW5lLmRlPohcBBMRAgAcBQI920ypAhsDBAsHAwIDFQID
-AxYCAQIeAQIXgAAKCRDAsWt97yWxumkAAJ9VkJrA28GshH/R/jKx9XIrj/bEuwCf
-RdbOeyO6jHYkRtL7hTcniI1JBWS0IE9saXZlciBCcmF1biA8b2JyYXVuQHVuc2Fu
-ZS5vcmc+iF8EExECAB8CGwMECwcDAgMVAgMDFgIBAh4BAheAAhkBBQI+GA6BAAoJ
-EMCxa33vJbG6+64AoNStGZfAj4K0BuwRGmas0oiDOiGQAJ48+YnzdsRyUjiYi2Ja
-InWbIpDRULkBDQQ69afaEAQAlaNzX3ql+XfLobAAIWW/TdY9Yh6r0fFFoK2Mdt6v
-ungWhzSWb63DprREXyW1k6QbPQxL+pAfeCYZoXQuNBmsUpO1Xn6ViEGRd53D07sN
-JfBrE/5w3hwL+c9lWSJlt0vHKzFtPAmqenBdfA0fs9afiew2sHhk/jz/FAwWcnF4
-aC8AAwUD/0upFaHEZsf8sVmSEew5tAtZ6i3xzaBjhaDv3sYobza57S8mXYhscK+n
-NHx3bP036wJ0z8ypqb5oCqGzWUkj9OpYZs0uTbpla/MoCI9N1Ch8LfQkWPuvYjHF
-6LSY3wpZKaNWfeZPCmMT5XPqjuxDB1pCmnAUOizLyimZU2Y8tfQWiEYEGBECAAYF
-Ajr1p9oACgkQwLFrfe8lsbqmfgCffgEhvau11EUoZmkdnzUg2rbKYnQAn1fVK9Tj
-WnJWQ/YDOn9hmMZWYjib
-=lNL1
+6oea3ep5uaU82r1sGe7/cVzMGUwzZq9xizwODfbmSW6E+vdAjLQgT2xpdmVyIEJy
+YXVuIDxvYnJhdW5AdW5zYW5lLm9yZz6IXwQTEQIAHwIbAwQLBwMCAxUCAwMWAgEC
+HgECF4ACGQEFAj4YDoEACgkQwLFrfe8lsbr7rgCg1K0Zl8CPgrQG7BEaZqzSiIM6
+IZAAnjz5ifN2xHJSOJiLYloidZsikNFQtDJPbGl2ZXIgQnJhdW4gPG9icmF1bkBp
+bmZvcm1hdGlrLnVuaWJ3LW11ZW5jaGVuLmRlPohXBBMRAgAXBQsHCgMEAxUDAgMW
+AgECF4AFAjr1p9sACgkQwLFrfe8lsbpa3gCggfubCGJb0C/SzhtAPGOfVDk5+yEA
+nRCQuSNQiQrGMSLdS2GSlJ0dDOTptCBPbGl2ZXIgQnJhdW4gPG9icmF1bkBvYnJh
+dW4ubmV0PohcBBMRAgAcBQI9Y1sqAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDA
+sWt97yWxuv0CAJ9lUDzKKdaCp/8mJjlXLjlSZaaJTgCfXIqQr58p5MSFkVdLhLbK
+1P1l8FK0IU9saXZlciBCcmF1biA8b2JyYXVuQGZyZWVic2Qub3JnPohcBBMRAgAc
+BQI9Y1tFAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRDAsWt97yWxukHLAJ9uoP9c
+IdBXldt7XfQ/5xK2fUsHPgCdFIR7cK0l0spO2xjzbzhoPPVShbq0H09saXZlciBC
+cmF1biA8b2JyYXVuQHVuc2FuZS5kZT6IXAQTEQIAHAUCPdtMqQIbAwQLBwMCAxUC
+AwMWAgECHgECF4AACgkQwLFrfe8lsbppAACfVZCawNvBrIR/0f4ysfVyK4/2xLsA
+n0XWznsjuox2JEbS+4U3J4iNSQVkuQENBDr1p9oQBACVo3NfeqX5d8uhsAAhZb9N
+1j1iHqvR8UWgrYx23q+6eBaHNJZvrcOmtERfJbWTpBs9DEv6kB94JhmhdC40GaxS
+k7VefpWIQZF3ncPTuw0l8GsT/nDeHAv5z2VZImW3S8crMW08Cap6cF18DR+z1p+J
+7DaweGT+PP8UDBZycXhoLwADBQP/S6kVocRmx/yxWZIR7Dm0C1nqLfHNoGOFoO/e
+xihvNrntLyZdiGxwr6c0fHds/TfrAnTPzKmpvmgKobNZSSP06lhmzS5NumVr8ygI
+j03UKHwt9CRY+69iMcXotJjfClkpo1Z95k8KYxPlc+qO7EMHWkKacBQ6LMvKKZlT
+Zjy19BaIRgQYEQIABgUCOvWn2gAKCRDAsWt97yWxuqZ+AJ9+ASG9q7XURShmaR2f
+NSDatspidACfV9Ur1ONaclZD9gM6f2GYxlZiOJs=
+=Z7Q6
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>