diff --git a/share/pgpkeys/aaron.key b/share/pgpkeys/aaron.key
deleted file mode 100644
index 5d76bb92e5..0000000000
--- a/share/pgpkeys/aaron.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048g/304EE8E5 2006-06-21 [expires: 2011-06-20]
-]]>
-
diff --git a/share/pgpkeys/ahze.key b/share/pgpkeys/ahze.key
deleted file mode 100644
index 6961411030..0000000000
--- a/share/pgpkeys/ahze.key
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
- Key fingerprint = 363C 6ABA ED24 C23B 5F0C 3AB4 9F8B AA7D 3C04 6FD6
-uid Michael Johnson (pgp key)
-sub 2048g/FA334AE3 2004-10-29
-]]>
-
diff --git a/share/pgpkeys/alepulver.key b/share/pgpkeys/alepulver.key
deleted file mode 100644
index 06d7bae6ff..0000000000
--- a/share/pgpkeys/alepulver.key
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-uid Alejandro Pulver (Ale's GPG key pair)
-sub 2048g/6890C6CA 2005-11-13
-]]>
-
diff --git a/share/pgpkeys/alex.key b/share/pgpkeys/alex.key
deleted file mode 100644
index a5c1e37081..0000000000
--- a/share/pgpkeys/alex.key
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
- Key fingerprint = B757 5ABF 691F 4011 F565 3765 BFBB 3506 8E25 23FD
-sub 1024g/16C3B12D 2003-01-28
-]]>
-
diff --git a/share/pgpkeys/alexbl.key b/share/pgpkeys/alexbl.key
deleted file mode 100644
index 26242501c6..0000000000
--- a/share/pgpkeys/alexbl.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048g/CA287923 2006-09-13
-]]>
-
diff --git a/share/pgpkeys/andreas.key b/share/pgpkeys/andreas.key
deleted file mode 100644
index 7e4188d87a..0000000000
--- a/share/pgpkeys/andreas.key
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
- Key fingerprint = F028 D51A 0D42 DD67 4109 19A3 777A 3E94 6C6F 6CBA
-uid Andreas Klemm
-uid Andreas Klemm
-uid Andreas Klemm
-sub 2048g/FE23F866 2001-01-06
-]]>
-
diff --git a/share/pgpkeys/anholt.key b/share/pgpkeys/anholt.key
deleted file mode 100644
index 5dce4b5b0a..0000000000
--- a/share/pgpkeys/anholt.key
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-uid Eric Anholt
-sub 1024g/80B404C1 2003-09-08
-]]>
-
diff --git a/share/pgpkeys/anray.key b/share/pgpkeys/anray.key
deleted file mode 100644
index a573286ec2..0000000000
--- a/share/pgpkeys/anray.key
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-uid Andrey Slusar
-uid Andrey Slusar
-sub 2048g/7D0EB77D 2005-12-12
-]]>
-
diff --git a/share/pgpkeys/arun.key b/share/pgpkeys/arun.key
deleted file mode 100644
index 39bf142c36..0000000000
--- a/share/pgpkeys/arun.key
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- Key fingerprint = A074 41D6 8537 C7D5 070E 0F78 0247 1AE2 7D11 2181
-uid Arun Sharma
-uid Arun Sharma
-sub 1024g/ACAD98DA 2003-03-06 [expires: 2005-03-05]
-]]>
-
diff --git a/share/pgpkeys/asami.key b/share/pgpkeys/asami.key
deleted file mode 100644
index c50b27b5cc..0000000000
--- a/share/pgpkeys/asami.key
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- Key fingerprint = EB 3C 68 9E FB 6C EB 3F DB 2E 0F 10 8F CE 79 CA
-uid Satoshi Asami
-]]>
-
diff --git a/share/pgpkeys/bakul.key b/share/pgpkeys/bakul.key
deleted file mode 100644
index 715fa15ba1..0000000000
--- a/share/pgpkeys/bakul.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048g/5C3DCC24 2006-04-20
-]]>
-
diff --git a/share/pgpkeys/barner.key b/share/pgpkeys/barner.key
deleted file mode 100644
index 42750c9e70..0000000000
--- a/share/pgpkeys/barner.key
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-uid Simon Barner
-uid Simon Barner
-uid Simon Barner
-sub 2048g/F63052DE 2000-11-10
-]]>
-
diff --git a/share/pgpkeys/ben.key b/share/pgpkeys/ben.key
deleted file mode 100644
index bb77b640ec..0000000000
--- a/share/pgpkeys/ben.key
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- Key fingerprint = 355D 0FFF B83A 90A9 D648 E409 6CFC C9FB 2CEF 442C
-uid Ben Smithurst
-uid Ben Smithurst
-uid Ben Smithurst
-uid Ben Smithurst
-uid Ben Smithurst
-sub 1024g/347071FF 2001-07-11
-]]>
-
diff --git a/share/pgpkeys/benjsc.key b/share/pgpkeys/benjsc.key
deleted file mode 100644
index 62ceba1019..0000000000
--- a/share/pgpkeys/benjsc.key
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-uid Benjamin Simon Close
-uid Benjamin Simon Close
-sub 2048g/3FA8A57E 2002-04-10
-]]>
-
diff --git a/share/pgpkeys/billf.key b/share/pgpkeys/billf.key
deleted file mode 100644
index 25bc8e3fcd..0000000000
--- a/share/pgpkeys/billf.key
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- Key fingerprint = 5B2D 908E 4C2B F253 DAEB FC01 8436 B70B 7F86 8268
-uid Bill Fumerola (Security Yahoo)
-sub 1024g/43980DA9 2000-12-07
-]]>
-
diff --git a/share/pgpkeys/bmah.key b/share/pgpkeys/bmah.key
deleted file mode 100644
index 11c0be7cc1..0000000000
--- a/share/pgpkeys/bmah.key
+++ /dev/null
@@ -1,493 +0,0 @@
-
-
-
-uid Bruce A. Mah
-uid Bruce A. Mah
-uid Bruce A. Mah
-uid Bruce A. Mah
-uid Bruce A. Mah
-uid Bruce A. Mah
-uid Bruce A. Mah
-sub 2048g/B4E60EA1 1997-12-08
-]]>
-
diff --git a/share/pgpkeys/bsd.key b/share/pgpkeys/bsd.key
deleted file mode 100644
index d97d694dcf..0000000000
--- a/share/pgpkeys/bsd.key
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- Key fingerprint = EF49 7ABE 47ED 91B3 FC3D 7EA5 4D90 2FF7 723B DEE9
-sub 1024g/4B02F876 2002-01-23
-]]>
-
diff --git a/share/pgpkeys/bushman.key b/share/pgpkeys/bushman.key
deleted file mode 100644
index 8bb4d861a1..0000000000
--- a/share/pgpkeys/bushman.key
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-uid Michael Bushkov
-sub 2048g/5A783997 2007-03-11 [expires: 2008-03-10]
-]]>
-
diff --git a/share/pgpkeys/bvs.key b/share/pgpkeys/bvs.key
deleted file mode 100644
index 15ab09b54f..0000000000
--- a/share/pgpkeys/bvs.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- Key fingerprint = 402E B8E4 53CB 22FF BE62 AE35 A0BF B077 B320 17F7
-uid Vitaly Bogdanov
-sub 1024g/0E88C62E 2005-10-02
-]]>
-
diff --git a/share/pgpkeys/cel.key b/share/pgpkeys/cel.key
deleted file mode 100644
index 290e523bf4..0000000000
--- a/share/pgpkeys/cel.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048g/9BCE0459 2006-02-13
-]]>
-
diff --git a/share/pgpkeys/cjc.key b/share/pgpkeys/cjc.key
deleted file mode 100644
index a5d2211d3c..0000000000
--- a/share/pgpkeys/cjc.key
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Key fingerprint = F04E CCD7 3834 72C2 707F 0A8F 259F 8F4B FE88 6AD3
-uid Crist J. Clark
-uid Crist J. Clark
-sub 1024g/9B6BAB99 2002-01-25
-]]>
-
diff --git a/share/pgpkeys/cjh.key b/share/pgpkeys/cjh.key
deleted file mode 100644
index 7009739a4b..0000000000
--- a/share/pgpkeys/cjh.key
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Key fingerprint = 1369 7374 A45F F41A F3C0 07E3 4A01 C020 E602 60F5
-uid CHOI Junho (Personal)
-uid CHOI Junho (FreeBSD)
-sub 1024g/04A4FDD8 2002-10-14
-]]>
-
diff --git a/share/pgpkeys/clive.key b/share/pgpkeys/clive.key
deleted file mode 100644
index 7642b56adb..0000000000
--- a/share/pgpkeys/clive.key
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
- Key fingerprint = FA3F 20B6 A77A 6CEC 1856 09B0 7455 2805 A008 C03E
-uid Clive Lin
-uid Clive Lin
-sub 1024g/03C2DC87 2001-07-30 [expires: 2005-08-25]
-]]>
-
diff --git a/share/pgpkeys/cshumway.key b/share/pgpkeys/cshumway.key
deleted file mode 100644
index 23b35c7538..0000000000
--- a/share/pgpkeys/cshumway.key
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- Key fingerprint = 45F5 931B 0646 BF84 E78E E274 6C29 340E 3219 F982
-uid Christopher Shumway
-sub 1024g/D215EFED 2001-05-17
-]]>
-
diff --git a/share/pgpkeys/damien.key b/share/pgpkeys/damien.key
deleted file mode 100644
index cac904374e..0000000000
--- a/share/pgpkeys/damien.key
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-uid Damien Bergamini
-sub 2048R/9FBA73A4 2005-03-02
-]]>
-
diff --git a/share/pgpkeys/dannyboy.key b/share/pgpkeys/dannyboy.key
deleted file mode 100644
index f093b6bb01..0000000000
--- a/share/pgpkeys/dannyboy.key
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- Key fingerprint = 3C61 B8A1 3F09 D194 3259 7173 6C63 DA04 84D0 D7E7
-uid Daniel Harris
-uid Daniel Harris
-uid Daniel Harris
-sub 1024g/9DF0231A 2001-01-15
-]]>
-
diff --git a/share/pgpkeys/dcs.key b/share/pgpkeys/dcs.key
deleted file mode 100644
index cdc65e1b82..0000000000
--- a/share/pgpkeys/dcs.key
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- Key fingerprint = AF 90 A6 A2 B5 8D 6C 28 37 F3 F4 47 8B 31 47 DF
-uid Daniel C. Sobral
-]]>
-
diff --git a/share/pgpkeys/den.key b/share/pgpkeys/den.key
deleted file mode 100644
index bfa2991b95..0000000000
--- a/share/pgpkeys/den.key
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- Key fingerprint = 495D 158C 8EC9 C2C1 80F5 EA96 6F72 7C1C 485D DDF5
-sub 1024g/E70BA158 2003-09-11
-]]>
-
diff --git a/share/pgpkeys/dfr.key b/share/pgpkeys/dfr.key
deleted file mode 100644
index db82c59d32..0000000000
--- a/share/pgpkeys/dfr.key
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-sub 1024g/6207AA32 2004-02-07
-]]>
-
diff --git a/share/pgpkeys/dhartmei.key b/share/pgpkeys/dhartmei.key
deleted file mode 100644
index b7b9874f21..0000000000
--- a/share/pgpkeys/dhartmei.key
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
- Key fingerprint = 13 7E 9A F3 36 82 09 FE FD 57 B8 5C 2B 81 7E 1F
-]]>
-
diff --git a/share/pgpkeys/farrokhi.key b/share/pgpkeys/farrokhi.key
deleted file mode 100644
index 301d4f4a3f..0000000000
--- a/share/pgpkeys/farrokhi.key
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-uid Babak Farrokhi
-sub 2048g/2A5F93C7 2005-12-22
-]]>
-
diff --git a/share/pgpkeys/foxfair.key b/share/pgpkeys/foxfair.key
deleted file mode 100644
index 14dbc5d222..0000000000
--- a/share/pgpkeys/foxfair.key
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
- Key fingerprint = 280C A846 CA1B CAC9 DDCF F4CB D553 4BD5 4E9B CA59
-uid Foxfair Hu
-uid Howard Hu
-sub 1024g/3356D8C1 2003-09-01
-]]>
-
diff --git a/share/pgpkeys/garys.key b/share/pgpkeys/garys.key
deleted file mode 100644
index 50dcf54fec..0000000000
--- a/share/pgpkeys/garys.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048g/E34C3CA0 2005-08-22 [expires: 2007-08-22]
-]]>
-
diff --git a/share/pgpkeys/grehan.key b/share/pgpkeys/grehan.key
deleted file mode 100644
index 6a7d671be5..0000000000
--- a/share/pgpkeys/grehan.key
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- Key fingerprint = 84AD 73DC 370E 15CA 7556 43C8 F5C8 4450 EA45 EA7D
-sub 2048g/0E122D70 2004-07-13
-]]>
-
diff --git a/share/pgpkeys/gsutter.key b/share/pgpkeys/gsutter.key
deleted file mode 100644
index e9aeba29cf..0000000000
--- a/share/pgpkeys/gsutter.key
+++ /dev/null
@@ -1,317 +0,0 @@
-
-
-
- Key fingerprint = D161 E4EA 4BFA 2427 F3F9 5B1F 2015 31D5 845D FEDD
-uid Gregory S. Sutter
-uid Gregory S. Sutter
-uid Gregory S. Sutter
-sub 2048g/0A37BBCE 2000-10-10
-]]>
-
diff --git a/share/pgpkeys/ijliao.key b/share/pgpkeys/ijliao.key
deleted file mode 100644
index 9fc89a2b95..0000000000
--- a/share/pgpkeys/ijliao.key
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
- Key fingerprint = 4E98 55CC 2866 7A90 EFD7 9DA5 ACC6 0165 11C0 2382
-uid Ying-Chieh Liao
-uid Ying-Chieh Liao
-uid Ying-Chieh Liao
-uid Ying-Chieh Liao
-sub 4096g/C1E16E89 2001-01-09
-]]>
-
diff --git a/share/pgpkeys/jacula.key b/share/pgpkeys/jacula.key
deleted file mode 100644
index 118d7db7b7..0000000000
--- a/share/pgpkeys/jacula.key
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-uid Giuseppe Pilichi (Jacula Modyun)
-uid Giuseppe Pilichi (Jacula Modyun)
-uid Giuseppe Pilichi (Jacula Modyun)
-sub 4096R/FB4D05A3 2006-03-08
-]]>
-
diff --git a/share/pgpkeys/jcamou.key b/share/pgpkeys/jcamou.key
deleted file mode 100644
index 6a25ae9fb6..0000000000
--- a/share/pgpkeys/jcamou.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048g/F8D2A8DF 2005-03-01
-]]>
-
diff --git a/share/pgpkeys/jdp.key b/share/pgpkeys/jdp.key
deleted file mode 100644
index 1bac7d2565..0000000000
--- a/share/pgpkeys/jdp.key
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
- Key fingerprint = 54 3A 90 59 6B A4 9D 61 BF 1D 03 09 35 8D F6 0D
-]]>
-
diff --git a/share/pgpkeys/jedgar.key b/share/pgpkeys/jedgar.key
deleted file mode 100644
index 7180c62064..0000000000
--- a/share/pgpkeys/jedgar.key
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
- Key fingerprint = A47D A838 9216 F921 A456 54FF 39B6 86E0 FE81 7A50
-uid Chris D. Faulhaber
-sub 2048g/93452698 2000-12-20
-]]>
-
diff --git a/share/pgpkeys/jesper.key b/share/pgpkeys/jesper.key
deleted file mode 100644
index 5178170113..0000000000
--- a/share/pgpkeys/jesper.key
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
- Key fingerprint = 6B88 9CE8 66E9 E631 C9C5 5EB4 22AB F0EC F956 1C31
-uid Jesper Skriver
-uid Jesper Skriver
-sub 1024g/777C378C 2001-03-09
-]]>
-
diff --git a/share/pgpkeys/jim.key b/share/pgpkeys/jim.key
deleted file mode 100644
index d1ec1ad5a1..0000000000
--- a/share/pgpkeys/jim.key
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- Key fingerprint = AEEC 998D 7828 D306 AFF7 06CA D8FE 7285 3AA4 FEE0
-uid Jim Mock
-sub 1024g/3780652B 2002-01-10
-]]>
-
diff --git a/share/pgpkeys/jkh.key b/share/pgpkeys/jkh.key
deleted file mode 100644
index f8faa0d745..0000000000
--- a/share/pgpkeys/jkh.key
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Key fingerprint = 3C F2 27 7E 4A 6C 09 0A 4B C9 47 CD 4F 4D 0B 20
-]]>
-
diff --git a/share/pgpkeys/jmb.key b/share/pgpkeys/jmb.key
deleted file mode 100644
index e713bd8639..0000000000
--- a/share/pgpkeys/jmb.key
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
- Key fingerprint = 31 57 41 56 06 C1 40 13 C5 1C E3 E5 DC 62 0E FB
-uid Jonathan M. Bresler
-uid Jonathan M. Bresler
-uid Jonathan M. Bresler
-uid Jonathan M. Bresler
-]]>
-
diff --git a/share/pgpkeys/joe.key b/share/pgpkeys/joe.key
deleted file mode 100644
index b8e754da9a..0000000000
--- a/share/pgpkeys/joe.key
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
- Key fingerprint = 7266 8EAF 82C2 D439 5642 AC26 5D52 1C8C E6B1 5016
-uid Josef Karthauser
-uid Josef Karthauser
-uid [revoked] Josef Karthauser
-uid [revoked] Josef Karthauser
-sub 2048g/1178B692 2000-10-19
-]]>
-
diff --git a/share/pgpkeys/josef.key b/share/pgpkeys/josef.key
deleted file mode 100644
index 26f91c3479..0000000000
--- a/share/pgpkeys/josef.key
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- Key fingerprint = 58EB F5B7 2AB9 37FE 33C8 716B 59C5 22D9 A79D B53C
-uid Josef El-Rayes
-]]>
-
diff --git a/share/pgpkeys/jylefort.key b/share/pgpkeys/jylefort.key
deleted file mode 100644
index dc5e089a1f..0000000000
--- a/share/pgpkeys/jylefort.key
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-uid Jean-Yves Lefort
-sub 4096g/C9271AFC 2002-09-07
-]]>
-
diff --git a/share/pgpkeys/koitsu.key b/share/pgpkeys/koitsu.key
deleted file mode 100644
index 0c0e81ce75..0000000000
--- a/share/pgpkeys/koitsu.key
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-uid Jeremy Chadwick
-uid Jeremy Chadwick
-sub 2048g/1D3235AF 2006-01-23
-]]>
-
diff --git a/share/pgpkeys/krion.key b/share/pgpkeys/krion.key
deleted file mode 100644
index 905b1fa8d1..0000000000
--- a/share/pgpkeys/krion.key
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-uid Kirill Ponomarew
-uid Kirill Ponomarew
-sub 1024D/05AC7CA0 2006-01-30 [expires: 2008-01-30]
-sub 2048g/C3EE5537 2006-01-30 [expires: 2008-01-30]
-]]>
-
diff --git a/share/pgpkeys/laszlof.key b/share/pgpkeys/laszlof.key
deleted file mode 100644
index 5d97f9ac2a..0000000000
--- a/share/pgpkeys/laszlof.key
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-]]>
-
diff --git a/share/pgpkeys/lawrance.key b/share/pgpkeys/lawrance.key
deleted file mode 100644
index 3e6570dc9d..0000000000
--- a/share/pgpkeys/lawrance.key
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-uid Sam Lawrance
-sub 2048g/0F9CCF92 2003-08-14
-]]>
-
diff --git a/share/pgpkeys/lesi.key b/share/pgpkeys/lesi.key
deleted file mode 100644
index c9c45e2dab..0000000000
--- a/share/pgpkeys/lesi.key
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
- Key fingerprint = 2C5C 02EA 1060 1D6D 9982 38C0 1DA7 DBC4 96C5 221F
-uid Dejan Lesjak
-sub 1024g/E0A69278 2004-08-18
-]]>
-
diff --git a/share/pgpkeys/lofi.key b/share/pgpkeys/lofi.key
deleted file mode 100644
index 3f42b26cb0..0000000000
--- a/share/pgpkeys/lofi.key
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
- Key fingerprint = 1079 3C72 0726 F300 B8EC 60F9 5E17 3AF1 6B29 74B0
-uid Michael Nottebrock
-uid Michael Nottebrock
-uid Michael Nottebrock
-uid Michael Nottebrock
-uid Michael Nottebrock
-sub 1024g/EF652E04 2002-06-06 [expires: 2004-06-15]
-]]>
-
diff --git a/share/pgpkeys/markp.key b/share/pgpkeys/markp.key
deleted file mode 100644
index 5dded3e250..0000000000
--- a/share/pgpkeys/markp.key
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- Key fingerprint = 58C9 C9BF C758 D8D4 7022 8EF5 559F 7F7B 182C 368F
-uid Mark Pulford
-sub 2048g/380573E8 2000-05-10
-]]>
-
diff --git a/share/pgpkeys/marks.key b/share/pgpkeys/marks.key
deleted file mode 100644
index 745e70bbfe..0000000000
--- a/share/pgpkeys/marks.key
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-uid Mark Santcroos
-uid Mark Santcroos
-sub 2048g/FFF80F85 2005-03-08
-]]>
-
diff --git a/share/pgpkeys/metal.key b/share/pgpkeys/metal.key
deleted file mode 100644
index fae213b480..0000000000
--- a/share/pgpkeys/metal.key
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- Key fingerprint = 92B9 A202 B5AB 8CB6 89FC 6DD1 5737 C702 AE56 2682
-sub 4096g/730E604B 2004-05-23
-]]>
-
diff --git a/share/pgpkeys/mheinen.key b/share/pgpkeys/mheinen.key
deleted file mode 100644
index b80f8d20f2..0000000000
--- a/share/pgpkeys/mheinen.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- Key fingerprint = C898 3FCD EEA0 17ED BEA9 564D E5A6 AFF2 116C 5C85
-uid Martin Heinen
-sub 1024g/EA67506B 2002-06-17
-]]>
-
diff --git a/share/pgpkeys/mikeh.key b/share/pgpkeys/mikeh.key
deleted file mode 100644
index 804c2d117f..0000000000
--- a/share/pgpkeys/mikeh.key
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
- Key fingerprint = AFAB CCEB 68C7 573F 5110 9285 1689 1942 CDEC BF99
-uid Michael Heffner
-uid Michael Heffner
-uid Michael Heffner
-uid Michael Heffner (ACM sysadmin)
-sub 1024g/3FE83FB5 2001-02-02
-]]>
-
diff --git a/share/pgpkeys/nate.key b/share/pgpkeys/nate.key
deleted file mode 100644
index 69b810b734..0000000000
--- a/share/pgpkeys/nate.key
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- Key fingerprint = 8EE8 5E72 8A94 51FA EA68 E001 FFF9 8AA9 C2AC 6BA4
-sub 1024g/03EE46D2 2002-01-28
-]]>
-
diff --git a/share/pgpkeys/nectar.key b/share/pgpkeys/nectar.key
deleted file mode 100644
index ad2f687e75..0000000000
--- a/share/pgpkeys/nectar.key
+++ /dev/null
@@ -1,495 +0,0 @@
-
-
-
- Key fingerprint = CB CE 7D A0 6E 01 DC 61 E5 91 0A BE 79 17 D3 82
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-
-pub 1024D/1606DB95 2001-07-05 Jacques A. Vidrine
- Key fingerprint = 46BC EA5B F70A CC81 5332 0832 8C32 8CFF 1606 DB95
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-uid Jacques A. Vidrine
-sub 2048g/57EDEA6F 2001-07-05
-]]>
-
diff --git a/share/pgpkeys/nemoliu.key b/share/pgpkeys/nemoliu.key
deleted file mode 100644
index 3432dc7214..0000000000
--- a/share/pgpkeys/nemoliu.key
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-sub 4096g/B6D7B15D 2007-07-10
-]]>
-
diff --git a/share/pgpkeys/nik.key b/share/pgpkeys/nik.key
deleted file mode 100644
index 80365c52de..0000000000
--- a/share/pgpkeys/nik.key
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
- Key fingerprint = 15B8 3FFC DDB4 34B0 AA5F 94B7 93A8 0764 2C37 E375
-uid Nik Clayton
-uid Nik Clayton
-uid Nik Clayton
-uid Nik Clayton
-sub 1024g/769E298A 2000-11-09
-]]>
-
diff --git a/share/pgpkeys/niklas.key b/share/pgpkeys/niklas.key
deleted file mode 100644
index 4d1db21164..0000000000
--- a/share/pgpkeys/niklas.key
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- Key fingerprint = C41E F734 AF0E 3D21 7499 9EB1 9A31 2E7E C822 A476
-sub 1024g/81E2FF36 2004-03-09
-]]>
-
diff --git a/share/pgpkeys/njl.key b/share/pgpkeys/njl.key
deleted file mode 100644
index 1cc0ae1d27..0000000000
--- a/share/pgpkeys/njl.key
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-sub 2048g/CDBC7E1B 2007-02-07
-]]>
-
diff --git a/share/pgpkeys/nsouch.key b/share/pgpkeys/nsouch.key
deleted file mode 100644
index 0791628c5c..0000000000
--- a/share/pgpkeys/nsouch.key
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- Key fingerprint = 992A 144F AC0F 40BA 55AE DE6D 752D 0A6C C744 F18B
-sub 1024g/90BD3231 2002-02-13
-]]>
-
diff --git a/share/pgpkeys/obraun.key b/share/pgpkeys/obraun.key
deleted file mode 100644
index c486e40899..0000000000
--- a/share/pgpkeys/obraun.key
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- Key fingerprint = 6A3B 042A 732E 17E4 B6E7 3EAF C0B1 6B7D EF25 B1BA
-uid Oliver Braun
-uid Oliver Braun
-uid Oliver Braun
-sub 1024g/09D28582 2001-05-06
-]]>
-
diff --git a/share/pgpkeys/patrick.key b/share/pgpkeys/patrick.key
deleted file mode 100644
index 77161a4473..0000000000
--- a/share/pgpkeys/patrick.key
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- Key fingerprint = 54 7C D6 81 B1 63 D2 5E BD DD 58 4D A4 0E E4 E1
-uid Patrick Gardella
-uid patrick@freebsd.org
-uid Patrick Gardella
-
-pub 1024D/C6AF4835 2000-01-19 Patrick Gardella
- Key fingerprint = 4B2D 3CFA 963B E310 847E 7D6C C072 B447 C6AF 4835
-uid Patrick Gardella
-uid Patrick Gardella
-sub 2048g/DB3B83E7 2000-01-19
-
-pub 1024R/EE2D47A9 1996-08-17 Patrick Gardella
- Key fingerprint = A6 DE 3C C0 33 CF 36 E6 D1 F5 BB E8 3C C4 67 50
-]]>
-
diff --git a/share/pgpkeys/paul.key b/share/pgpkeys/paul.key
deleted file mode 100644
index 05849d59ac..0000000000
--- a/share/pgpkeys/paul.key
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
- Key fingerprint = 38 4F 33 80 53 92 01 46 ED 4B A4 91 3E 1E 6B FE
-uid Dr David Paul Richards
-uid Paul Richards
-uid Paul Richards
-uid Paul Richards
-]]>
-
diff --git a/share/pgpkeys/perky.key b/share/pgpkeys/perky.key
deleted file mode 100644
index c9fefcdae4..0000000000
--- a/share/pgpkeys/perky.key
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
- Key fingerprint = 09D9 57D6 58BA 44DD CAEC 71CD 0D65 2C59 CFDB 4BA4
-uid Hye-Shik Chang
-sub 1024g/A94A8ED1 1999-04-23
-]]>
-
diff --git a/share/pgpkeys/petef.key b/share/pgpkeys/petef.key
deleted file mode 100644
index 3d5f4112e1..0000000000
--- a/share/pgpkeys/petef.key
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
-
- Key fingerprint = 9A9F 8A13 DB0D 7777 8D8E 1CB2 C5C9 A08F 74B9 1CFD
-uid Pete Fritchman
-uid Pete Fritchman
-sub 1024g/0C02AF0C 2001-01-30
-]]>
-
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 8decc29c04..8c6c10b5d6 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -44,11 +44,6 @@
&pgpkey.dim;
-
- &a.anholt;
- &pgpkey.anholt;
-
-
&a.mva;
&pgpkey.mva;
@@ -64,11 +59,6 @@
&pgpkey.mat;
-
- &a.asami;
- &pgpkey.asami;
-
-
&a.gavin;
&pgpkey.gavin;
@@ -94,16 +84,6 @@
&pgpkey.gjb;
-
- &a.snb;
- &pgpkey.snb;
-
-
-
- &a.barner;
- &pgpkey.barner;
-
-
&a.dougb;
&pgpkey.dougb;
@@ -119,11 +99,6 @@
&pgpkey.tobez;
-
- &a.damien;
- &pgpkey.damien;
-
-
&a.tdb;
&pgpkey.tdb;
@@ -139,11 +114,6 @@
&pgpkey.wblock;
-
- &a.bvs;
- &pgpkey.bvs;
-
-
&a.novel;
&pgpkey.novel;
@@ -154,11 +124,6 @@
&pgpkey.garga;
-
- &a.alexbl;
- &pgpkey.alexbl;
-
-
&a.sbz;
&pgpkey.sbz;
@@ -169,21 +134,11 @@
&pgpkey.harti;
-
- &a.obraun;
- &pgpkey.obraun;
-
-
&a.makc;
&pgpkey.makc;
-
- &a.jmb;
- &pgpkey.jmb;
-
-
&a.antoine;
&pgpkey.antoine;
@@ -209,21 +164,11 @@
&pgpkey.oleg;
-
- &a.bushman;
- &pgpkey.bushman;
-
-
&a.jchandra;
&pgpkey.jchandra;
-
- &a.jcamou;
- &pgpkey.jcamou;
-
-
&a.acm;
&pgpkey.acm;
@@ -234,23 +179,11 @@
&pgpkey.gahr;
-
-
&a.dchagin;
&pgpkey.dchagin;
-
- &a.perky;
- &pgpkey.perky;
-
-
&a.jon;
&pgpkey.jon;
@@ -281,19 +214,9 @@
&pgpkey.melifaro;
-
- &a.seanc;
- &pgpkey.seanc;
-
-
-
- &a.cjh;
- &pgpkey.cjh;
-
-
-
- &a.cjc;
- &pgpkey.cjc;
+
+ &a.theraven;
+ &pgpkey.theraven;
@@ -301,16 +224,6 @@
&pgpkey.marcus;
-
- &a.nik;
- &pgpkey.nik;
-
-
-
- &a.benjsc;
- &pgpkey.benjsc;
-
-
&a.tijl;
&pgpkey.tijl;
@@ -331,11 +244,6 @@
&pgpkey.culot;
-
- &a.aaron;
- &pgpkey.aaron;
-
-
&a.bapt;
&pgpkey.bapt;
@@ -356,11 +264,6 @@
&pgpkey.pjd;
-
- &a.bsd;
- &pgpkey.bsd;
-
-
&a.vd;
&pgpkey.vd;
@@ -396,21 +299,11 @@
&pgpkey.peadar;
-
- &a.josef;
- &pgpkey.josef;
-
-
&a.lme;
&pgpkey.lme;
-
- &a.ue;
- &pgpkey.ue;
-
-
&a.ru;
&pgpkey.ru;
@@ -436,16 +329,6 @@
&pgpkey.stefanf;
-
- &a.farrokhi;
- &pgpkey.farrokhi;
-
-
-
- &a.jedgar;
- &pgpkey.jedgar;
-
-
&a.green;
&pgpkey.green;
@@ -466,21 +349,11 @@
&pgpkey.blackend;
-
- &a.petef;
- &pgpkey.petef;
-
-
&a.decke;
&pgpkey.decke;
-
- &a.billf;
- &pgpkey.billf;
-
-
&a.avg;
&pgpkey.avg;
@@ -511,11 +384,6 @@
&pgpkey.mnag;
-
- &a.grehan;
- &pgpkey.grehan;
-
-
&a.jamie;
&pgpkey.jamie;
@@ -526,16 +394,6 @@
&pgpkey.jmg;
-
- &a.dannyboy;
- &pgpkey.dannyboy;
-
-
-
- &a.dhartmei;
- &pgpkey.dhartmei;
-
-
&a.ohauer;
&pgpkey.ohauer;
@@ -551,21 +409,6 @@
&pgpkey.jhay;
-
- &a.sheldonh;
- &pgpkey.sheldonh;
-
-
-
- &a.mikeh;
- &pgpkey.mikeh;
-
-
-
- &a.mheinen;
- &pgpkey.mheinen;
-
-
&a.niels;
&pgpkey.niels;
@@ -611,21 +454,11 @@
&pgpkey.lwhsu;
-
- &a.foxfair;
- &pgpkey.foxfair;
-
-
&a.chinsan;
&pgpkey.chinsan;
-
- &a.jkh;
- &pgpkey.jkh;
-
-
&a.versus;
&pgpkey.versus;
@@ -641,16 +474,6 @@
&pgpkey.jinmei;
-
- &a.ahze;
- &pgpkey.ahze;
-
-
-
- &a.trevor;
- &pgpkey.trevor;
-
-
&a.phk;
&pgpkey.phk;
@@ -666,16 +489,6 @@
&pgpkey.cokane;
-
- &a.joe;
- &pgpkey.joe;
-
-
-
- &a.vkashyap;
- &pgpkey.vkashyap;
-
-
&a.kris;
&pgpkey.kris;
@@ -711,21 +524,11 @@
&pgpkey.jceel;
-
- &a.andreas;
- &pgpkey.andreas;
-
-
&a.jkois;
&pgpkey.jkois;
-
- &a.sergei;
- &pgpkey.sergei;
-
-
&a.maxim;
&pgpkey.maxim;
@@ -766,11 +569,6 @@
&pgpkey.rik;
-
- &a.rushani;
- &pgpkey.rushani;
-
-
&a.kuriyama;
&pgpkey.kuriyama;
@@ -811,21 +609,6 @@
&pgpkey.glarkin;
-
- &a.laszlof;
- &pgpkey.laszlof;
-
-
-
- &a.lawrance;
- &pgpkey.lawrance;
-
-
-
- &a.njl;
- &pgpkey.njl;
-
-
&a.leeym;
&pgpkey.leeym;
@@ -836,11 +619,6 @@
&pgpkey.sam;
-
- &a.jylefort;
- &pgpkey.jylefort;
-
-
&a.netchild;
&pgpkey.netchild;
@@ -851,16 +629,6 @@
&pgpkey.ae;
-
- &a.lesi;
- &pgpkey.lesi;
-
-
-
- &a.cel;
- &pgpkey.cel;
-
-
&a.glewis;
&pgpkey.glewis;
@@ -876,21 +644,11 @@
&pgpkey.avatar;
-
- &a.ijliao;
- &pgpkey.ijliao;
-
-
&a.lulf;
&pgpkey.lulf;
-
- &a.clive;
- &pgpkey.clive;
-
-
&a.yzlin;
&pgpkey.yzlin;
@@ -911,11 +669,6 @@
&pgpkey.dryice;
-
- &a.nemoliu;
- &pgpkey.nemoliu;
-
-
&a.zml;
&pgpkey.zml;
@@ -946,11 +699,6 @@
&pgpkey.rmacklem;
-
- &a.bmah;
- &pgpkey.bmah;
-
-
&a.rm;
&pgpkey.rm;
@@ -991,11 +739,6 @@
&pgpkey.sem;
-
- &a.tmclaugh;
- &pgpkey.tmclaugh;
-
-
&a.jmelo;
&pgpkey.jmelo;
@@ -1051,21 +794,11 @@
&pgpkey.lippe;
-
- &a.rich;
- &pgpkey.rich;
-
-
&a.knu;
&pgpkey.knu;
-
- &a.tmm;
- &pgpkey.tmm;
-
-
&a.max;
&pgpkey.max;
@@ -1076,11 +809,6 @@
&pgpkey.maho;
-
- &a.yoichi;
- &pgpkey.yoichi;
-
-
&a.trasz;
&pgpkey.trasz;
@@ -1111,11 +839,6 @@
&pgpkey.anders;
-
- &a.lofi;
- &pgpkey.lofi;
-
-
&a.obrien;
&pgpkey.obrien;
@@ -1146,21 +869,11 @@
&pgpkey.fluffy;
-
- &a.sat;
- &pgpkey.sat;
-
-
&a.np;
&pgpkey.np;
-
- &a.rpaulo;
- &pgpkey.rpaulo;
-
-
&a.mp;
&pgpkey.mp;
@@ -1171,11 +884,6 @@
&pgpkey.roam;
-
- &a.den;
- &pgpkey.den;
-
-
&a.csjp;
&pgpkey.csjp;
@@ -1186,36 +894,11 @@
&pgpkey.gerald;
-
- &a.jacula;
- &pgpkey.jacula;
-
-
-
- &a.jdp;
- &pgpkey.jdp;
-
-
-
- &a.krion;
- &pgpkey.krion;
-
-
&a.sepotvin;
&pgpkey.sepotvin;
-
- &a.markp;
- &pgpkey.markp;
-
-
-
- &a.alepulver;
- &pgpkey.alepulver;
-
-
&a.thomas;
&pgpkey.thomas;
@@ -1226,11 +909,6 @@
&pgpkey.hq;
-
- &a.dfr;
- &pgpkey.dfr;
-
-
&a.lbr;
&pgpkey.lbr;
@@ -1241,11 +919,6 @@
&pgpkey.crees;
-
- &a.rees;
- &pgpkey.rees;
-
-
&a.bcr;
&pgpkey.bcr;
@@ -1296,21 +969,11 @@
&pgpkey.ray;
-
- &a.niklas;
- &pgpkey.niklas;
-
-
&a.bsam;
&pgpkey.bsam;
-
- &a.marks;
- &pgpkey.marks;
-
-
&a.bschmidt;
&pgpkey.bschmidt;
@@ -1346,21 +1009,11 @@
&pgpkey.johans;
-
- &a.bakul;
- &pgpkey.bakul;
-
-
&a.gshapiro;
&pgpkey.gshapiro;
-
- &a.arun;
- &pgpkey.arun;
-
-
&a.wxs;
&pgpkey.wxs;
@@ -1396,21 +1049,6 @@
&pgpkey.demon;
-
- &a.jesper;
- &pgpkey.jesper;
-
-
-
- &a.scop;
- &pgpkey.scop;
-
-
-
- &a.anray;
- &pgpkey.anray;
-
-
&a.flo;
&pgpkey.flo;
@@ -1426,11 +1064,6 @@
&pgpkey.kensmith;
-
- &a.ben;
- &pgpkey.ben;
-
-
&a.des;
&pgpkey.des;
@@ -1451,11 +1084,6 @@
&pgpkey.sson;
-
- &a.nsouch;
- &pgpkey.nsouch;
-
-
&a.ssouhlal;
&pgpkey.ssouhlal;
@@ -1466,16 +1094,6 @@
&pgpkey.uqs;
-
- &a.rink;
- &pgpkey.rink;
-
-
-
- &a.vsevolod;
- &pgpkey.vsevolod;
-
-
&a.zi;
&pgpkey.zi;
@@ -1491,11 +1109,6 @@
&pgpkey.murray;
-
- &a.vs;
- &pgpkey.vs;
-
-
&a.rstone;
&pgpkey.rstone;
@@ -1521,26 +1134,11 @@
&pgpkey.clsung;
-
- &a.gsutter;
- &pgpkey.gsutter;
-
-
-
- &a.metal;
- &pgpkey.metal;
-
-
&a.ryusuke;
&pgpkey.ryusuke;
-
- &a.garys;
- &pgpkey.garys;
-
-
&a.nyan;
&pgpkey.nyan;
@@ -1646,11 +1244,6 @@
&pgpkey.ups;
-
- &a.nectar;
- &pgpkey.nectar;
-
-
&a.avilla;
&pgpkey.avilla;
@@ -1696,21 +1289,11 @@
&pgpkey.miwi;
-
- &a.nate;
- &pgpkey.nate;
-
-
&a.swills;
&pgpkey.swills;
-
- &a.twinterg;
- &pgpkey.twinterg;
-
-
&a.wollman;
&pgpkey.wollman;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 0f672d2c8f..8e870ac45a 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -1,49 +1,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -54,44 +38,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -105,17 +75,14 @@
-
-
-
@@ -126,50 +93,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -177,23 +130,17 @@
-
-
-
-
-
-
@@ -207,8 +154,6 @@
-
-
@@ -219,11 +164,8 @@
-
-
-
@@ -233,32 +175,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -266,7 +196,6 @@
-
@@ -275,12 +204,9 @@
-
-
-
@@ -289,39 +215,29 @@
-
-
-
-
-
-
-
-
-
-
@@ -336,29 +252,19 @@
-
-
-
-
-
-
-
-
-
-
@@ -367,7 +273,6 @@
-
diff --git a/share/pgpkeys/pirzyk.key b/share/pgpkeys/pirzyk.key
deleted file mode 100644
index b2d844ab38..0000000000
--- a/share/pgpkeys/pirzyk.key
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- Key fingerprint = 07EE A1BD 32E5 C402 59B6 22D5 D846 31D1 4E23 DACA
-uid Jim Pirzyk
-sub 1024g/F38895F7 2001-03-02
-]]>
-
diff --git a/share/pgpkeys/rees.key b/share/pgpkeys/rees.key
deleted file mode 100644
index 9739f9671d..0000000000
--- a/share/pgpkeys/rees.key
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- Key fingerprint = 02 5F 1B 15 B4 6E F1 3E F1 C5 E0 1D EA CC 17 88
-]]>
-
diff --git a/share/pgpkeys/rich.key b/share/pgpkeys/rich.key
deleted file mode 100644
index 2dcb802a53..0000000000
--- a/share/pgpkeys/rich.key
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- Key fingerprint = AF A0 60 C4 84 D6 0C 73 D1 EF C0 E9 9D 21 DB E4
-]]>
-
diff --git a/share/pgpkeys/rink.key b/share/pgpkeys/rink.key
deleted file mode 100644
index 2c78f6889e..0000000000
--- a/share/pgpkeys/rink.key
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-uid Rink Springer (FreeBSD Project)
-uid Rink Springer
-sub 2048g/3BC3E67E 2003-09-19
-]]>
-
diff --git a/share/pgpkeys/rpaulo.key b/share/pgpkeys/rpaulo.key
deleted file mode 100644
index 3586e4c019..0000000000
--- a/share/pgpkeys/rpaulo.key
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-uid Rui Paulo
-sub 4096R/F87D2F34 2010-02-03
-]]>
-
diff --git a/share/pgpkeys/rushani.key b/share/pgpkeys/rushani.key
deleted file mode 100644
index 191adb7b98..0000000000
--- a/share/pgpkeys/rushani.key
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Key fingerprint = A052 6F98 6146 6FE3 91E2 DA6B F2FA 2088 439A DC57
-uid Hideyuki KURASHINA
-uid Hideyuki KURASHINA
-sub 1024g/64764D16 2002-03-22
-]]>
-
diff --git a/share/pgpkeys/sat.key b/share/pgpkeys/sat.key
deleted file mode 100644
index 61351fd97c..0000000000
--- a/share/pgpkeys/sat.key
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-uid Andrew Pantyukhin
-uid Andrew Pantyukhin
-uid Andrew Pantyukhin
-sub 2048g/5BD4D469 2006-05-06
-]]>
-
diff --git a/share/pgpkeys/sbruno.key b/share/pgpkeys/sbruno.key
deleted file mode 100644
index 5bfe4d841d..0000000000
--- a/share/pgpkeys/sbruno.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-sub 2048R/3A48F987 2011-10-19
-]]>
-
diff --git a/share/pgpkeys/scop.key b/share/pgpkeys/scop.key
deleted file mode 100644
index d50d58850a..0000000000
--- a/share/pgpkeys/scop.key
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- Key fingerprint = 4E0D EBAB 3106 F1FA 3FA9 B875 D98C D635 BCD2 41CB
-uid Ville Skyttä
-uid Ville Skyttä
-sub 2048g/9426F4D1 2002-04-07
-]]>
-
diff --git a/share/pgpkeys/seanc.key b/share/pgpkeys/seanc.key
deleted file mode 100644
index 970ed0a5ac..0000000000
--- a/share/pgpkeys/seanc.key
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- Key fingerprint = E41F F441 7E91 6CBA 1844 65CF B939 3C78 EE27 8A28
-sub 2048g/55321853 2004-02-08
-]]>
-
diff --git a/share/pgpkeys/sergei.key b/share/pgpkeys/sergei.key
deleted file mode 100644
index a298fdccb3..0000000000
--- a/share/pgpkeys/sergei.key
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Key fingerprint = A2F4 5F34 0586 CC9C 493A 347C 14EC 6E69 3BA5 3401
-uid Sergei Kolobov
-sub 2048g/F8243671 2003-10-10
-]]>
-
diff --git a/share/pgpkeys/sheldonh.key b/share/pgpkeys/sheldonh.key
deleted file mode 100644
index 4998c6cf48..0000000000
--- a/share/pgpkeys/sheldonh.key
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
- Key fingerprint = 01A3 EF91 9C5A 3633 4E01 8085 A462 57F1 74A0 6ACD
-sub 1536g/C42F8AC8 2002-06-20
-]]>
-
diff --git a/share/pgpkeys/snb.key b/share/pgpkeys/snb.key
deleted file mode 100644
index 67bbd752f0..0000000000
--- a/share/pgpkeys/snb.key
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-sub 2048R/36E181FB 2010-07-27
-sub 2048R/BDA4BED3 2010-07-29
-sub 2048R/782A8737 2010-07-29
-]]>
-
diff --git a/share/pgpkeys/stephane.key b/share/pgpkeys/stephane.key
deleted file mode 100644
index 7c2f8e4472..0000000000
--- a/share/pgpkeys/stephane.key
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- Key fingerprint = A219 AD42 AD1E 00BF E30B D213 94EE 8EC7 0F01 CAE3
-sub 1024g/A7429D55 2001-04-20
-]]>
-
diff --git a/share/pgpkeys/tmclaugh.key b/share/pgpkeys/tmclaugh.key
deleted file mode 100644
index fb063deebe..0000000000
--- a/share/pgpkeys/tmclaugh.key
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-uid Tom McLaughlin (Work email address)
-uid Tom McLaughlin (FreeBSD email address)
-sub 2048g/16838F62 2005-05-24
-]]>
-
diff --git a/share/pgpkeys/tmm.key b/share/pgpkeys/tmm.key
deleted file mode 100644
index c72c479208..0000000000
--- a/share/pgpkeys/tmm.key
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- Key fingerprint = 1C97 A604 2BD0 E492 51D0 9C0F 1FE6 4F1D 419C 776C
-uid Thomas Moestl
-uid Thomas Moestl
-sub 2048g/ECE63CE6 2000-11-28
-]]>
-
diff --git a/share/pgpkeys/trevor.key b/share/pgpkeys/trevor.key
deleted file mode 100644
index 5d6ad4c32e..0000000000
--- a/share/pgpkeys/trevor.key
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
- Key fingerprint = 7ED1 5A92 76C1 FFCB E5E3 A998 F037 5A0B 3A3E A137
-sub 1024g/46C24F1E 2000-04-20
-]]>
-
diff --git a/share/pgpkeys/twinterg.key b/share/pgpkeys/twinterg.key
deleted file mode 100644
index c76dac31f4..0000000000
--- a/share/pgpkeys/twinterg.key
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-uid Thomas Wintergerst
-uid Thomas Wintergerst
-uid Thomas Wintergerst
-uid Thomas Wintergerst
-sub 2048g/3BEBEF8A 2006-01-08
-sub 1024D/8F631374 2006-01-08
-sub 2048g/34F631DC 2006-01-08
-]]>
-
diff --git a/share/pgpkeys/ue.key b/share/pgpkeys/ue.key
deleted file mode 100644
index 4e03ef3a96..0000000000
--- a/share/pgpkeys/ue.key
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
- Key fingerprint = 8C B1 80 CA 2C 52 73 81 FB A7 B4 03 C5 32 C8 67
-uid Udo Erdelhoff
-uid Udo Erdelhoff
-uid Udo Erdelhoff
-uid Udo Erdelhoff
-]]>
-
diff --git a/share/pgpkeys/viny.key b/share/pgpkeys/viny.key
deleted file mode 100644
index d0fab3e59c..0000000000
--- a/share/pgpkeys/viny.key
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- Key fingerprint = 2126 0A3B 54E9 CA39 8069 6D80 39CC B9D2 A0D2 2385
-sub 2048g/8C47ED80 2003-12-27
-]]>
-
diff --git a/share/pgpkeys/vkashyap.key b/share/pgpkeys/vkashyap.key
deleted file mode 100644
index d3d27952f1..0000000000
--- a/share/pgpkeys/vkashyap.key
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
- Key fingerprint = 9B83 0B55 604F E491 B7D2 759D DF92 DAA0 04FC CDD3
-]]>
-
diff --git a/share/pgpkeys/vs.key b/share/pgpkeys/vs.key
deleted file mode 100644
index 8cfe5f0867..0000000000
--- a/share/pgpkeys/vs.key
+++ /dev/null
@@ -1,206 +0,0 @@
-
-
-
- Key fingerprint = 69 6F BD A0 2E FE 19 66 CF B9 68 6E 41 7D F9 B9
-uid Volker Stolz (LSK)
-uid Volker Stolz
-]]>
-
diff --git a/share/pgpkeys/vsevolod.key b/share/pgpkeys/vsevolod.key
deleted file mode 100644
index de8a27cb2f..0000000000
--- a/share/pgpkeys/vsevolod.key
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-uid Vsevolod Stakhov
-uid Vsevolod Stakhov
-sub 2048g/786F2187 2005-03-14 [expires: 2008-03-13]
-]]>
-
diff --git a/share/pgpkeys/wes.key b/share/pgpkeys/wes.key
deleted file mode 100644
index 00082ee63d..0000000000
--- a/share/pgpkeys/wes.key
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
- Key fingerprint = 76C4 753C 83FF D982 C57D 3A2A 7387 E292 AD10 C6C4
-uid Wes Peters
-sub 1024g/237A5EF9 2000-10-19
-]]>
-
diff --git a/share/pgpkeys/yoichi.key b/share/pgpkeys/yoichi.key
deleted file mode 100644
index 0d9a4d195e..0000000000
--- a/share/pgpkeys/yoichi.key
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
- Key fingerprint = 1550 2662 46B3 096C 0460 BC03 800D 0C8A E078 8E46
-uid Yoichi NAKAYAMA
-uid Yoichi NAKAYAMA
-sub 1024g/B987A394 2000-12-28
-]]>
-