diff --git a/share/pgpkeys/gavin.key b/share/pgpkeys/gavin.key
new file mode 100644
index 0000000000..4fee31baea
--- /dev/null
+++ b/share/pgpkeys/gavin.key
@@ -0,0 +1,425 @@
+
+
+
+uid Gavin Atkinson (FreeBSD key)
+uid Gavin Atkinson (Work e-mail)
+uid Gavin Atkinson
+sub 2048g/58F40B3D 2005-02-18
+]]>
+
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 9675ff49b6..875f71a98b 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -44,6 +44,11 @@
&pgpkey.asami;
+
+ &a.gavin;
+ &pgpkey.gavin;
+
+
&a.jadawin;
&pgpkey.jadawin;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index cfd909f096..7e694d50aa 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -97,6 +97,7 @@
+