diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index d75f99de57..94f3e724b0 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -306,6 +306,11 @@
       &pgpkey.tijl;
     </sect2>
 
+    <sect2 id="pgpkey-rakuco">
+      <title>&a.rakuco;</title>
+      &pgpkey.rakuco;
+    </sect2>
+
     <sect2 id="pgpkey-brucec">
       <title>&a.brucec;</title>
       &pgpkey.brucec;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index e924a677cd..0ad9020662 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -268,6 +268,7 @@
 <!ENTITY pgpkey.pluknet SYSTEM "pluknet.key">
 <!ENTITY pgpkey.portmgr-secretary SYSTEM "portmgr-secretary.key">
 <!ENTITY pgpkey.rafan SYSTEM "rafan.key">
+<!ENTITY pgpkey.rakuco SYSTEM "rakuco.key">
 <!ENTITY pgpkey.ray SYSTEM "ray.key">
 <!ENTITY pgpkey.rdivacky SYSTEM "rdivacky.key">
 <!ENTITY pgpkey.rea SYSTEM "rea.key">
diff --git a/share/pgpkeys/rakuco.key b/share/pgpkeys/rakuco.key
new file mode 100644
index 0000000000..22bbe5b4fa
--- /dev/null
+++ b/share/pgpkeys/rakuco.key
@@ -0,0 +1,55 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh rakuco 1DD83BF9;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   1024D/1DD83BF9 2009-07-04
+      Key fingerprint = 71DF FF61 A402 C2D2 3B93  616B 74DE 3DF7 1DD8 3BF9
+uid                  Raphael Kubo da Costa <rakuco@FreeBSD.org>
+uid                  Raphael Kubo da Costa <kubito@gmail.com>
+sub   4096g/F03F08AA 2009-07-04
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=dCta
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>