diff --git a/share/pgpkeys/hrs.key b/share/pgpkeys/hrs.key
index 4263034774..71e79c52bb 100644
--- a/share/pgpkeys/hrs.key
+++ b/share/pgpkeys/hrs.key
@@ -1,50 +1,60 @@
 <!-- $FreeBSD$ -->
 <!--
-sh ./addkey.sh hrs 2793CF2D;
+sh addkey.sh hrs 2793CF2D;
 -->
 <programlisting role="pgpfingerprint"><![CDATA[
-pub  1024D/2793CF2D 2001-06-12 Hiroki Sato <hrs@eos.ocn.ne.jp>
+pub  1024D/2793CF2D 2001-06-12 Hiroki Sato <hrs@allbsd.org>
      Key fingerprint = BDB3 443F A5DD B3D0 A530  FFD7 4F2C D3D8 2793 CF2D
+uid                            Hiroki Sato <hrs@eos.ocn.ne.jp>
+uid                            Hiroki Sato <hrs@ring.gr.jp>
 uid                            Hiroki Sato <hrs@FreeBSD.org>
 uid                            Hiroki Sato <hrs@jp.FreeBSD.org>
-uid                            Hiroki Sato <hrs@allbsd.org>
 uid                            Hiroki Sato <hrs@vlsi.ee.noda.tus.ac.jp>
+uid                            Hiroki Sato <hrs@jp.NetBSD.org>
+uid                            Hiroki Sato <hrs@NetBSD.org>
 sub  1024g/8CD251FF 2001-06-12
 ]]></programlisting>
 <programlisting role="pgpkey"><![CDATA[
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.2.1 (FreeBSD)
 
 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
-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
+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
 F7Gi41lcFhA=
-=4qdv
+=uLMC
 -----END PGP PUBLIC KEY BLOCK-----
 ]]></programlisting>