diff --git a/share/pgpkeys/manolis.key b/share/pgpkeys/manolis.key
new file mode 100644
index 0000000000..063dd8195c
--- /dev/null
+++ b/share/pgpkeys/manolis.key
@@ -0,0 +1,54 @@
+<!-- $FreeBSD$ -->
+<!--
+sh addkey.sh manolis 6E0FB494;
+-->
+<programlisting role="pgpfingerprint"><![CDATA[
+pub   1024D/6E0FB494 2006-08-22
+      Key fingerprint = F820 5AAF 7112 2CDD 23D8  3BDF 67F3 311A 6E0F B494
+uid                  Manolis Kiagias <manolis@FreeBSD.org>
+uid                  Manolis Kiagias <sonicy@otenet.gr>
+uid                  Manolis Kiagias (A.K.A. sonic, sonicy, sonic2000gr) <sonic@diktia.dyndns.org>
+sub   2048g/EB94B411 2006-08-22
+]]></programlisting>
+<programlisting role="pgpkey"><![CDATA[
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBETrHk0RBADYhjqulMVEFFnTMQcFbUpNad/uZ589qbTFE0wzbEy1EOQZfcCW
+p1m6gq5e/aijOC5cj7bg1OBPSiDZWXT2/Y22eiEYK0ghpTrb0Y69xhLtZI5om5eD
+HmdNhytM48cyhvc7gqm3hBNtLWVNskcHRQU7rd/S1cjQHS5LnHgpPgnVrwCghFub
+wCn4j+jZtbwjuksX9TIreC8D/jlA2Q4CfoJuXTBkTCIXwFSXWRg71VIP/Mv54JaN
+g778e5QxiEowNJ6OwYfbkOa491QEERGWxs1FI0WCrrc1OXJVCUau3/kiKpZYC/cW
+CiTEDIeEsw2AHKuOVWhkbbhtUTms57gBqQ2+9IHmkcmKcusw9I5mAiGLLfGLgfBC
+VpDrBACc8jLhV8kMmfW1x0QGYkQ0/k/rA8/nDo2bfe7+bXoGmGjFvUKiMJT7C54O
+nnMfTKWlOvSrc6HZ3ijKNMTL/NteI5TeBO7Cd24BzzwEnqyAx+2wI4WUSKcxmew7
+BcXQi1UYhim+bobn1ksQ/vlDDWBBqYyyh+l/h4m5S5lG5dXGebQiTWFub2xpcyBL
+aWFnaWFzIDxzb25pY3lAb3RlbmV0LmdyPohgBBMRAgAgBQJGX/+iAhsDBgsJCAcD
+AgQVAggDBBYCAwECHgECF4AACgkQZ/MxGm4PtJRMsACePa4SsmNDWV8DXv/oo5D7
+XJwoAlUAn2sO1W8dSzyt8dKcU4a9/8/7UGSniEYEEBECAAYFAkfmBh8ACgkQ1g+U
+GjGGA7YpWACfa0OiwJ498UvMtC7FO1IDaz1XCCUAnApZ6SbLcInAs8HiWc7MxwQy
+CYAmtE1NYW5vbGlzIEtpYWdpYXMgKEEuSy5BLiBzb25pYywgc29uaWN5LCBzb25p
+YzIwMDBncikgPHNvbmljQGRpa3RpYS5keW5kbnMub3JnPoheBBMRAgAeBQJE6x5N
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEGfzMRpuD7SUA84An2lUyH/uT4WO
+6VnWvAojQn67VlI1AJ97ZjmCpjDzesP/ymHtsfLqZN7BqoheBBMRAgAeBQJE6x5N
+AhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJEGfzMRpuD7SUA84An3wjXvFKgYi2
+3n0tI1s+fmhvW6+0AJ9tLgfRP8kfsJ5k5cIQiGp2+NbGsohGBBARAgAGBQJH5gYf
+AAoJENYPlBoxhgO2nnwAoLD6IlMVRwFPZwJUpdnaBvllZshiAKCImg/wIzfQ1OOg
++325y5Ym+a0TWbQlTWFub2xpcyBLaWFnaWFzIDxtYW5vbGlzQEZyZWVCU0Qub3Jn
+PohgBBMRAgAgBQJIMxZ9AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQZ/Mx
+Gm4PtJSDCgCZARCfhV4ITYxz5lOJrhpLlBmFjhsAnisPyWloawVqmZgq/k46r8Om
+IgyxuQINBETrHnEQCACMx04CokMkxgtf1Jt/XqIFL7PT+ieA5n4cSkUwMmFcHN/Z
+W26WjAbhOXYCgnMH58fZa8qD25ao5KGdYbL7t1Zbt01hbyQiZgh1J92jvSQ9cg1A
+q6cq465Wng9W16X1D4MNi97F37DEp5g0T4sFVBoAnApGU4kVpjfKcdb0IU//eQBJ
+KGuhG8BtHM8w2RmAvHV4Kyf3VROXh9Hsk+VRDmCQRO9D9ZZFC8zxG0KNcqtC3hym
+qlIgIpZVK/INqRocdLMhQxL2ULZpneGzHDTqVCmfSSeNfnFr9d5GLd7ROMBuYMTx
+KS7TQyAN/xC3RMKyZmFSliSpQFw/AOUnG9i0Z/nDAAMFB/wIarW6c1h+lgP+B6vn
+sRI9StPYzS9QYogCpK6jwEMsmAzRGUrWgw+uIyxujKqcIlWypELDzPZJ34sjoRYy
+CCIHfdyNhFAGiZXKmdjETFFsFEN+Q3c58mXHYnVg65taQU01ISpwRhL0wsG4uws6
+QFVzX6lgIwtoIEPUr7ptr8N0zLUI9BE3S077WuscEnQMUiRcY9XmnP3ms1tQviVa
+ShTRG0yhVAg77YH7/PAS5tflVD8RlY5B3QFX9gTEXz9vhfgIy3FxWppP3GiVkXsy
+29GMMW8/sq9k8cpJrBRyfEXGhR+FCpgT9Vixo60iWpIfF2RaxxI0yUu5XnjcyAQj
+tWO6iEkEGBECAAkFAkTrHnECGwwACgkQZ/MxGm4PtJTy8QCfY3IIv45shk4Um8ts
+x4PX/wzHxscAoIHPNcR8OKoESON7vCoepxdHTQ9n
+=3/vj
+-----END PGP PUBLIC KEY BLOCK-----
+]]></programlisting>
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 589f20d1a6..56025014bd 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -494,6 +494,11 @@
       &pgpkey.fjoe;
     </sect2>
 
+    <sect2 id="pgpkey-manolis">
+      <title>&a.manolis;</title>
+      &pgpkey.manolis;
+    </sect2>
+
     <sect2 id="pgpkey-jkim">
       <title>&a.jkim;</title>
       &pgpkey.jkim;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 1728ea1eb4..9630388457 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -159,6 +159,7 @@
 <!ENTITY pgpkey.lwhsu SYSTEM "lwhsu.key">
 <!ENTITY pgpkey.lx SYSTEM "lx.key">
 <!ENTITY pgpkey.maho SYSTEM "maho.key">
+<!ENTITY pgpkey.manolis SYSTEM "manolis.key">
 <!ENTITY pgpkey.marcel SYSTEM "marcel.key">
 <!ENTITY pgpkey.marck SYSTEM "marck.key">
 <!ENTITY pgpkey.marcus SYSTEM "marcus.key">