diff --git a/share/pgpkeys/nivit.key b/share/pgpkeys/nivit.key
new file mode 100644
index 0000000000..7e06b02dc5
--- /dev/null
+++ b/share/pgpkeys/nivit.key
@@ -0,0 +1,41 @@
+
+
+
+sub 2048g/4C90805D 2006-12-05
+]]>
+
diff --git a/share/pgpkeys/pgpkeys-developers.sgml b/share/pgpkeys/pgpkeys-developers.sgml
index 8bf7fda214..dee269c2c8 100644
--- a/share/pgpkeys/pgpkeys-developers.sgml
+++ b/share/pgpkeys/pgpkeys-developers.sgml
@@ -1,1105 +1,1110 @@
&a.ariff;
&pgpkey.ariff;
&a.shaun;
&pgpkey.shaun;
&a.will;
&pgpkey.will;
&a.anholt;
&pgpkey.anholt;
&a.mat;
&pgpkey.mat;
&a.asami;
&pgpkey.asami;
&a.jhb;
&pgpkey.jhb;
&a.barner;
&pgpkey.barner;
&a.dougb;
&pgpkey.dougb;
&a.bvs;
&pgpkey.bvs;
&a.garga;
&pgpkey.garga;
&a.kib;
&pgpkey.kib;
&a.tobez;
&pgpkey.tobez;
&a.damien;
&pgpkey.damien;
&a.tdb;
&pgpkey.tdb;
&a.mbr;
&pgpkey.mbr;
&a.novel;
&pgpkey.novel;
&a.alexbl;
&pgpkey.alexbl;
&a.harti;
&pgpkey.harti;
&a.obraun;
&pgpkey.obraun;
&a.jmb;
&pgpkey.jmb;
&a.brueffer;
&pgpkey.brueffer;
&a.markus;
&pgpkey.markus;
&a.oleg;
&pgpkey.oleg;
&a.jcamou;
&pgpkey.jcamou;
&a.acm;
&pgpkey.acm;
&a.koitsu;
&pgpkey.koitsu;
&a.perky;
&pgpkey.perky;
&a.jon;
&pgpkey.jon;
&a.luoqi;
&pgpkey.luoqi;
&a.ache;
&pgpkey.ache;
&a.seanc;
&pgpkey.seanc;
&a.cjh;
&pgpkey.cjh;
&a.cjc;
&pgpkey.cjc;
&a.marcus;
&pgpkey.marcus;
&a.nik;
&pgpkey.nik;
&a.aaron;
&pgpkey.aaron;
&a.ceri;
&pgpkey.ceri;
&a.brd;
&pgpkey.brd;
&a.pjd;
&pgpkey.pjd;
&a.bsd;
&pgpkey.bsd;
&a.vd;
&pgpkey.vd;
&a.danfe;
&pgpkey.danfe;
&a.dd;
&pgpkey.dd;
&a.bruno;
&pgpkey.bruno;
&a.ale;
&pgpkey.ale;
&a.peadar;
&pgpkey.peadar;
&a.josef;
&pgpkey.josef;
&a.ue;
&pgpkey.ue;
&a.ru;
&pgpkey.ru;
&a.le;
&pgpkey.le;
&a.rafan;
&pgpkey.rafan;
&a.stefanf;
&pgpkey.stefanf;
&a.farrokhi;
&pgpkey.farrokhi;
&a.jedgar;
&pgpkey.jedgar;
&a.green;
&pgpkey.green;
&a.lioux;
&pgpkey.lioux;
&a.fanf;
&pgpkey.fanf;
&a.blackend;
&pgpkey.blackend;
&a.petef;
&pgpkey.petef;
&a.billf;
&pgpkey.billf;
&a.danger;
&pgpkey.danger;
&a.gioria;
&pgpkey.gioria;
&a.mnag;
&pgpkey.mnag;
&a.jmg;
&pgpkey.jmg;
&a.dannyboy;
&pgpkey.dannyboy;
&a.dhartmei;
&pgpkey.dhartmei;
&a.jhay;
&pgpkey.jhay;
&a.sheldonh;
&pgpkey.sheldonh;
&a.mikeh;
&pgpkey.mikeh;
&a.mheinen;
&pgpkey.mheinen;
&a.niels;
&pgpkey.niels;
&a.ghelmer;
&pgpkey.ghelmer;
&a.mux;
&pgpkey.mux;
&a.mich;
&pgpkey.mich;
&a.foxfair;
&pgpkey.foxfair;
&a.chinsan;
&pgpkey.chinsan;
&a.jkh;
&pgpkey.jkh;
&a.ahze;
&pgpkey.ahze;
&a.trevor;
&pgpkey.trevor;
&a.phk;
&pgpkey.phk;
&a.joe;
&pgpkey.joe;
&a.vkashyap;
&pgpkey.vkashyap;
&a.kris;
&pgpkey.kris;
&a.fjoe;
&pgpkey.fjoe;
&a.jkim;
&pgpkey.jkim;
&a.andreas;
&pgpkey.andreas;
&a.jkois;
&pgpkey.jkois;
&a.sergei;
&pgpkey.sergei;
&a.maxim;
&pgpkey.maxim;
&a.jkoshy;
&pgpkey.jkoshy;
&a.wkoszek;
&pgpkey.wkoszek;
&a.gabor;
&pgpkey.gabor;
&a.rik;
&pgpkey.rik;
&a.rushani;
&pgpkey.rushani;
&a.kuriyama;
&pgpkey.kuriyama;
&a.clement;
&pgpkey.clement;
&a.mlaier;
&pgpkey.mlaier;
&a.erwin;
&pgpkey.erwin;
&a.lawrance;
&pgpkey.lawrance;
&a.leeym;
&pgpkey.leeym;
&a.sam;
&pgpkey.sam;
&a.jylefort;
&pgpkey.jylefort;
&a.netchild;
&pgpkey.netchild;
&a.lesi;
&pgpkey.lesi;
&a.cel;
&pgpkey.cel;
&a.glewis;
&pgpkey.glewis;
&a.delphij;
&pgpkey.delphij;
&a.avatar;
&pgpkey.avatar;
&a.ijliao;
&pgpkey.ijliao;
&a.clive;
&pgpkey.clive;
&a.linimon;
&pgpkey.linimon;
&a.arved;
&pgpkey.arved;
&a.remko;
&pgpkey.remko;
&a.scottl;
&pgpkey.scottl;
&a.pav;
&pgpkey.pav;
&a.bmah;
&pgpkey.bmah;
&a.mtm;
&pgpkey.mtm;
&a.dwmalone;
&pgpkey.dwmalone;
&a.sem;
&pgpkey.sem;
&a.ehaupt;
&pgpkey.ehaupt;
&a.kwm;
&pgpkey.kwm;
&a.matusita;
&pgpkey.matusita;
&a.tmclaugh;
&pgpkey.tmclaugh;
&a.jmelo;
&pgpkey.jmelo;
&a.ken;
&pgpkey.ken;
&a.dinoex;
&pgpkey.dinoex;
&a.sanpei;
&pgpkey.sanpei;
&a.marcel;
&pgpkey.marcel;
&a.marck;
&pgpkey.marck;
&a.tmm;
&pgpkey.tmm;
&a.rich;
&pgpkey.rich;
&a.knu;
&pgpkey.knu;
&a.max;
&pgpkey.max;
&a.yoichi;
&pgpkey.yoichi;
&a.bland;
&pgpkey.bland;
&a.simon;
&pgpkey.simon;
&a.anders;
&pgpkey.anders;
&a.obrien;
&pgpkey.obrien;
&a.philip;
&pgpkey.philip;
&a.hmp;
&pgpkey.hmp;
&a.sat;
&pgpkey.sat;
&a.mp;
&pgpkey.mp;
&a.roam;
&pgpkey.roam;
&a.den;
&pgpkey.den;
&a.cperciva;
&pgpkey.cperciva;
&a.gerald;
&pgpkey.gerald;
&a.jdp;
&pgpkey.jdp;
&a.krion;
&pgpkey.krion;
&a.markp;
&pgpkey.markp;
&a.alepulver;
&pgpkey.alepulver;
&a.thomas;
&pgpkey.thomas;
&a.hq;
&pgpkey.hq;
&a.dfr;
&pgpkey.dfr;
&a.lbr;
&pgpkey.lbr;
&a.rees;
&pgpkey.rees;
&a.trhodes;
&pgpkey.trhodes;
&a.benno;
&pgpkey.benno;
&a.matteo;
&pgpkey.matteo;
&a.roberto;
&pgpkey.roberto;
&a.rodrigc;
&pgpkey.rodrigc;
&a.guido;
&pgpkey.guido;
&a.niklas;
&pgpkey.niklas;
&a.bsam;
&pgpkey.bsam;
&a.marks;
&pgpkey.marks;
&a.wosch;
&pgpkey.wosch;
&a.das;
&pgpkey.das;
&a.schweikh;
&pgpkey.schweikh;
&a.stas;
&pgpkey.stas;
&a.johans;
&pgpkey.johans;
&a.bakul;
&pgpkey.bakul;
&a.gshapiro;
&pgpkey.gshapiro;
&a.arun;
&pgpkey.arun;
&a.nork;
&pgpkey.nork;
&a.vanilla;
&pgpkey.vanilla;
&a.demon;
&pgpkey.demon;
&a.jesper;
&pgpkey.jesper;
&a.scop;
&pgpkey.scop;
&a.anray;
&pgpkey.anray;
&a.glebius;
&pgpkey.glebius;
&a.kensmith;
&pgpkey.kensmith;
&a.ben;
&pgpkey.ben;
&a.des;
&pgpkey.des;
&a.sobomax;
&pgpkey.sobomax;
&a.brian;
&pgpkey.brian;
&a.nsouch;
&pgpkey.nsouch;
&a.ssouhlal;
&pgpkey.ssouhlal;
&a.rink;
&pgpkey.rink;
&a.vsevolod;
&pgpkey.vsevolod;
&a.vs;
&pgpkey.vs;
&a.xride;
&pgpkey.xride;
&a.clsung;
&pgpkey.clsung;
&a.gsutter;
&pgpkey.gsutter;
&a.metal;
&pgpkey.metal;
&a.garys;
&pgpkey.garys;
&a.nyan;
&pgpkey.nyan;
&a.itetcu;
&pgpkey.itetcu;
&a.mi;
&pgpkey.mi;
&a.gordon;
&pgpkey.gordon;
&a.lth;
&pgpkey.lth;
&a.lx;
&pgpkey.lx;
&a.thierry;
&pgpkey.thierry;
&a.thompsa;
&pgpkey.thompsa;
&a.flz;
&pgpkey.flz;
&a.ume;
&pgpkey.ume;
&a.ups;
&pgpkey.ups;
&a.nectar;
&pgpkey.nectar;
+
+ &a.nivit;
+ &pgpkey.nivit;
+
+
&a.stefan;
&pgpkey.stefan;
&a.adamw;
&pgpkey.adamw;
&a.peter;
&pgpkey.peter;
&a.nate;
&pgpkey.nate;
&a.wollman;
&pgpkey.wollman;
&a.miwi;
&pgpkey.miwi;
&a.twinterg;
&pgpkey.twinterg;
&a.joerg;
&pgpkey.joerg;
&a.emax;
&pgpkey.emax;
&a.bz;
&pgpkey.bz;
&a.phantom;
&pgpkey.phantom;
&a.davidxu;
&pgpkey.davidxu;
&a.rrs;
&pgpkey.rrs;
diff --git a/share/pgpkeys/pgpkeys.ent b/share/pgpkeys/pgpkeys.ent
index 592f623fad..1458ac0364 100644
--- a/share/pgpkeys/pgpkeys.ent
+++ b/share/pgpkeys/pgpkeys.ent
@@ -1,253 +1,254 @@
+