diff --git a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
index a56ebf4449..7eeb2f4f31 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml
@@ -8651,11 +8651,6 @@
 	<email>ryan@transaeris.com</email></para>
     </listitem>
 
-    <listitem>
-      <para>Ryan Steinmetz
-	<email>rpsfa@rit.edu</email></para>
-    </listitem>
-
     <listitem>
       <para>Ryan T. Dean
 	<email>rtdean@cytherianage.net</email></para>
diff --git a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
index b61ab37883..82b7d32e44 100644
--- a/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
+++ b/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml
@@ -1829,6 +1829,10 @@
     <listitem>
       <para>&a.az;</para>
     </listitem>
+
+    <listitem>
+      <para>&a.zi;</para>
+    </listitem>
   </itemizedlist>
 
 <!--
diff --git a/en_US.ISO8859-1/share/sgml/authors.ent b/en_US.ISO8859-1/share/sgml/authors.ent
index e66f2c6cc1..39e08a835c 100644
--- a/en_US.ISO8859-1/share/sgml/authors.ent
+++ b/en_US.ISO8859-1/share/sgml/authors.ent
@@ -1296,6 +1296,8 @@
 
 <!ENTITY a.zec "Marko Zec <email>zec@FreeBSD.org</email>">
 
+<!ENTITY a.zi "Ryan Steinmetz <email>zi@FreeBSD.org</email>">
+
 <!ENTITY a.zml "Zachary Loafman <email>zml@FreeBSD.org</email>">
 
 <!ENTITY a.znerd "Ernst de Haan <email>znerd@FreeBSD.org</email>">
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 7ebd68d8b1..116b046fdd 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -1706,3 +1706,8 @@
       &pgpkey.sephe;
     </sect2>
 
+    <sect2 id="pgpkey-zi">
+      <title>&a.zi;</title>
+      &pgpkey.zi;
+    </sect2>
+
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index d8e7d5ea97..e924a677cd 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -361,6 +361,7 @@
 <!ENTITY pgpkey.yoichi SYSTEM "yoichi.key">
 <!ENTITY pgpkey.yzlin SYSTEM "yzlin.key">
 <!ENTITY pgpkey.zack SYSTEM "zack.key">
+<!ENTITY pgpkey.zi SYSTEM "zi.key">
 <!ENTITY pgpkey.zml SYSTEM "zml.key">
 <!ENTITY section.pgpkeys-core		SYSTEM "pgpkeys-core.sgml">
 <!ENTITY section.pgpkeys-developers	SYSTEM "pgpkeys-developers.sgml">
diff --git a/share/pgpkeys/zi.key b/share/pgpkeys/zi.key
new file mode 100644
index 0000000000..ed147fd4a0
--- /dev/null
+++ b/share/pgpkeys/zi.key
@@ -0,0 +1,80 @@
+<!-- $FreeBSD$ -->
+<!--
+sh ./addkey.sh zi 7AD7FAF2;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   1024D/7AD7FAF2 2004-01-21
+      Key fingerprint = EF36 D45A 5CA9 28B1 A550  18CD A43C D111 7AD7 FAF2
+uid                  Ryan Steinmetz <zi@FreeBSD.org>
+uid                  Ryan Steinmetz <rpsfa@rit.edu>
+uid                  Ryan Steinmetz <zi@zi0r.com>
+sub   1024g/058BC057 2004-01-21
+sub   4096g/0EB108D2 2006-02-27
+sub   1024D/FEF36DD7 2006-02-27
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+ZTV4zXhavRs=
+=wi3x
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>