diff --git a/documentation/content/en/articles/pgpkeys/_index.adoc b/documentation/content/en/articles/pgpkeys/_index.adoc
index 06d6b1f783..4be4d8c27d 100644
--- a/documentation/content/en/articles/pgpkeys/_index.adoc
+++ b/documentation/content/en/articles/pgpkeys/_index.adoc
@@ -1,1438 +1,1441 @@
 ---
 title: OpenPGP Keys
 description: List of OpenPGP keys that can be used to verify a signature or send encrypted email to FreeBSD.org officers or developers.
 tags: ["OpenPGP", "Developers", "Officers", "FreeBSD"]
 ---
 
 = OpenPGP Keys
 :doctype: article
 :toc: macro
 :toclevels: 1
 :icons: font
 :sectnums:
 :sectnumlevels: 6
 :source-highlighter: rouge
 :experimental:
 :images-path: articles/pgpkeys/
 
 ifdef::env-beastie[]
 ifdef::backend-html5[]
 include::shared/authors.adoc[]
 include::shared/mirrors.adoc[]
 include::shared/releases.adoc[]
 include::shared/attributes/attributes-{{% lang %}}.adoc[]
 include::shared/{{% lang %}}/teams.adoc[]
 include::shared/{{% lang %}}/mailing-lists.adoc[]
 include::shared/{{% lang %}}/urls.adoc[]
 :imagesdir: ../../../images/{images-path}
 :include-path: static/pgpkeys/
 endif::[]
 ifdef::backend-pdf,backend-epub3[]
 include::../../../../shared/asciidoctor.adoc[]
 // PGP keys are not included during the build
 // See 29e47423be969b7fcc7125977c1b22ddd33fc671 revision
 // (a wrong path is used as a workaround)
 :include-path: ../../../static/pgpkeys/
 endif::[]
 endif::[]
 
 ifndef::env-beastie[]
 include::../../../../../shared/asciidoctor.adoc[]
 :include-path: ../../../static/pgpkeys/
 endif::[]
 
 '''
 
 toc::[]
 
 These OpenPGP keys can be used to verify a signature or send encrypted email to `FreeBSD.org` officers or developers.
 The complete keyring can be downloaded at link:https://docs.FreeBSD.org/pgpkeys/pgpkeys.txt[pgpkeyring.txt].
 
 ////
 Do not edit this file except as instructed by the addkey.sh script.
 
 See the README file in /data/pgpkeys for instructions.
 
 This article contains all the keys.  The officer keys are also
 shown in the Handbook PGP keys chapter.
 ////
 
 [[pgpkeys-officers]]
 == Officers
 
 === {security-officer-name} `<{security-officer-email}>`
 include::{include-path}security-officer.key[]
 
 === {secteam-secretary-name} `<{secteam-secretary-email}>`
 include::{include-path}secteam-secretary.key[]
 
 === {core-secretary-name} `<{core-secretary-email}>`
 include::{include-path}core-secretary.key[]
 
 === {portmgr-secretary-name} `<{portmgr-secretary-email}>`
 include::{include-path}portmgr-secretary.key[]
 
 === `{doceng-secretary-email}`
 include::{include-path}doceng-secretary.key[]
 
 [[pgpkeys-core]]
 == Core Team Members
 
 === `{bapt}`
 include::{include-path}bapt.key[]
 
 === `{gnn}`
 include::{include-path}gnn.key[]
 
 === `{hrs}`
 include::{include-path}hrs.key[]
 
 === `{imp}`
 include::{include-path}imp.key[]
 
 === `{kevans}`
 include::{include-path}kevans.key[]
 
 === `{sef}`
 include::{include-path}sef.key[]
 
 === `{markj}`
 include::{include-path}markj.key[]
 
 === `{scottl}`
 include::{include-path}scottl.key[]
 
 [[pgpkeys-developers]]
 == Developers
 
 === `{jgh}`
 include::{include-path}jgh.key[]
 
 === `{ariff}`
 include::{include-path}ariff.key[]
 
 === `{tabthorpe}`
 include::{include-path}tabthorpe.key[]
 
 === `{eadler}`
 include::{include-path}eadler.key[]
 
 === `{shaun}`
 include::{include-path}shaun.key[]
 
 === `{brix}`
 include::{include-path}brix.key[]
 
 === `{mandree}`
 include::{include-path}mandree.key[]
 
 === `{will}`
 include::{include-path}will.key[]
 
 === `{dim}`
 include::{include-path}dim.key[]
 
 === `{anholt}`
 include::{include-path}anholt.key[]
 
 === `{fernape}`
 include::{include-path}fernape.key[]
 
 === `{mva}`
 include::{include-path}mva.key[]
 
 === `{araujo}`
 include::{include-path}araujo.key[]
 
 === `{mat}`
 include::{include-path}mat.key[]
 
 === `{syuu}`
 include::{include-path}syuu.key[]
 
 === `{asami}`
 include::{include-path}asami.key[]
 
 === `{jsa}`
 include::{include-path}jsa.key[]
 
 === `{jadawin}`
 include::{include-path}jadawin.key[]
 
 === `{jwb}`
 include::{include-path}jwb.key[]
 
 === `{dbaio}`
 include::{include-path}dbaio.key[]
 
 === `{timur}`
 include::{include-path}timur.key[]
 
 === `{jhb}`
 include::{include-path}jhb.key[]
 
 === `{gjb}`
 include::{include-path}gjb.key[]
 
 === `{snb}`
 include::{include-path}snb.key[]
 
 === `{barner}`
 include::{include-path}barner.key[]
 
 === `{lbartoletti}`
 include::{include-path}lbartoletti.key[]
 
 === `{art}`
 include::{include-path}art.key[]
 
 === `{tobez}`
 include::{include-path}tobez.key[]
 
 === `{damien}`
 include::{include-path}damien.key[]
 
 === `{bdragon}`
 include::{include-path}bdragon.key[]
 
 === `{tcberner}`
 include::{include-path}tcberner.key[]
 
 === `{tdb}`
 include::{include-path}tdb.key[]
 
 === `{mbr}`
 include::{include-path}mbr.key[]
 
 === `{bvs}`
 include::{include-path}bvs.key[]
 
 === `{novel}`
 include::{include-path}novel.key[]
 
 === `{garga}`
 include::{include-path}garga.key[]
 
 === `{kbowling}`
 include::{include-path}kbowling.key[]
 
 === `{alexbl}`
 include::{include-path}alexbl.key[]
 
 === `{ebrandi}`
 include::{include-path}ebrandi.key[]
 
 === `{harti}`
 include::{include-path}harti.key[]
 
 === `{obraun}`
 include::{include-path}obraun.key[]
 
 === `{makc}`
 include::{include-path}makc.key[]
 
 === `{jmb}`
 include::{include-path}jmb.key[]
 
 === `{antoine}`
 include::{include-path}antoine.key[]
 
 === `{db}`
 include::{include-path}db.key[]
 
 === `{brueffer}`
 include::{include-path}brueffer.key[]
 
 === `{markus}`
 include::{include-path}markus.key[]
 
 === `{br}`
 include::{include-path}br.key[]
 
 === `{jch}`
 include::{include-path}jch.key[]
 
 === `{jchandra}`
 include::{include-path}jchandra.key[]
 
 === `{jcamou}`
 include::{include-path}jcamou.key[]
 
 === `{acm}`
 include::{include-path}acm.key[]
 
 === `{gahr}`
 include::{include-path}gahr.key[]
 
 === `{dchagin}`
 include::{include-path}dchagin.key[]
 
 === `{perky}`
 include::{include-path}perky.key[]
 
 === `{jon}`
 include::{include-path}jon.key[]
 
 === `{jonathan}`
 include::{include-path}jonathan.key[]
 
 === `{loader}`
 include::{include-path}loader.key[]
 
 === `{luoqi}`
 include::{include-path}luoqi.key[]
 
 === `{ache}`
 include::{include-path}ache.key[]
 
 === `{melifaro}`
 include::{include-path}melifaro.key[]
 
 === `{cjh}`
 include::{include-path}cjh.key[]
 
 === `{davidch}`
 include::{include-path}davidch.key[]
 
 === `{milki}`
 include::{include-path}milki.key[]
 
 === `{cjc}`
 include::{include-path}cjc.key[]
 
 === `{marcus}`
 include::{include-path}marcus.key[]
 
 === `{nik}`
 include::{include-path}nik.key[]
 
 === `{benjsc}`
 include::{include-path}benjsc.key[]
 
 === `{lcook}`
 include::{include-path}lcook.key[]
 
 === `{ngie}`
 include::{include-path}ngie.key[]
 
 === `{rakuco}`
 include::{include-path}rakuco.key[]
 
 === `{alc}`
 include::{include-path}alc.key[]
 
 === `{olivier}`
 include::{include-path}olivier.key[]
 
 === `{bcran}`
 include::{include-path}bcran.key[]
 
 === `{culot}`
 include::{include-path}culot.key[]
 
 === `{alfredo}`
 include::{include-path}alfredo.key[]
 
 === `{bapt}`
 include::{include-path}bapt.key[]
 
 === `{ceri}`
 include::{include-path}ceri.key[]
 
 === `{edavis}`
 include::{include-path}edavis.key[]
 
 === `{alexey}`
 include::{include-path}alexey.key[]
 
 === `{bsd}`
 include::{include-path}bsd.key[]
 
 === `{carl}`
 include::{include-path}carl.key[]
 
 === `{carlavilla}`
 include::{include-path}carlavilla.key[]
 
 === `{vd}`
 include::{include-path}vd.key[]
 
 === `{rdivacky}`
 include::{include-path}rdivacky.key[]
 
 === `{danfe}`
 include::{include-path}danfe.key[]
 
 === `{dd}`
 include::{include-path}dd.key[]
 
 === `{bdrewery}`
 include::{include-path}bdrewery.key[]
 
 === `{gad}`
 include::{include-path}gad.key[]
 
 === `{olivierd}`
 include::{include-path}olivierd.key[]
 
 === `{bruno}`
 include::{include-path}bruno.key[]
 
 === `{ale}`
 include::{include-path}ale.key[]
 
 === `{nemysis}`
 include::{include-path}nemysis.key[]
 
 === `{peadar}`
 include::{include-path}peadar.key[]
 
 === `{deischen}`
 include::{include-path}deischen.key[]
 
 === `{diizzy}`
 include::{include-path}diizzy.key[]
 
 === `{ue}`
 include::{include-path}ue.key[]
 
 === `{madpilot}`
 include::{include-path}madpilot.key[]
 
 === `{rafan}`
 include::{include-path}rafan.key[]
 
 === `{kami}`
 include::{include-path}kami.key[]
 
 === `{farrokhi}`
 include::{include-path}farrokhi.key[]
 
 === `{jedgar}`
 include::{include-path}jedgar.key[]
 
 === `{mfechner}`
 include::{include-path}mfechner.key[]
 
 === `{feld}`
 include::{include-path}feld.key[]
 
 === `{green}`
 include::{include-path}green.key[]
 
 === `{fanf}`
 include::{include-path}fanf.key[]
 
 === `{blackend}`
 include::{include-path}blackend.key[]
 
 === `{petef}`
 include::{include-path}petef.key[]
 
 === `{decke}`
 include::{include-path}decke.key[]
 
 === `{landonf}`
 include::{include-path}landonf.key[]
 
 === `{billf}`
 include::{include-path}billf.key[]
 
 === `{grembo}`
 include::{include-path}grembo.key[]
 
 === `{sgalabov}`
 include::{include-path}sgalabov.key[]
 
 === `{avg}`
 include::{include-path}avg.key[]
 
 === `{beat}`
 include::{include-path}beat.key[]
 
 === `{sjg}`
 include::{include-path}sjg.key[]
 
 === `{gibbs}`
 include::{include-path}gibbs.key[]
 
 === `{pfg}`
 include::{include-path}pfg.key[]
 
 === `{girgen}`
 include::{include-path}girgen.key[]
 
 === `{eugen}`
 include::{include-path}eugen.key[]
 
 === `{pgollucci}`
 include::{include-path}pgollucci.key[]
 
 === `{trociny}`
 include::{include-path}trociny.key[]
 
 === `{dmgk}`
 include::{include-path}dmgk.key[]
 
 === `{daichi}`
 include::{include-path}daichi.key[]
 
 === `{grehan}`
 include::{include-path}grehan.key[]
 
 === `{jamie}`
 include::{include-path}jamie.key[]
 
 === `{adridg}`
 include::{include-path}adridg.key[]
 
 === `{wg}`
 include::{include-path}wg.key[]
 
 === `{bar}`
 include::{include-path}bar.key[]
 
 === `{jmg}`
 include::{include-path}jmg.key[]
 
 === `{mjg}`
 include::{include-path}mjg.key[]
 
 === `{jhale}`
 include::{include-path}jhale.key[]
 
 === `{dannyboy}`
 include::{include-path}dannyboy.key[]
 
 === `{dhartmei}`
 include::{include-path}dhartmei.key[]
 
 === `{ohauer}`
 include::{include-path}ohauer.key[]
 
 === `{ehaupt}`
 include::{include-path}ehaupt.key[]
 
 === `{jhay}`
 include::{include-path}jhay.key[]
 
 === `{bhd}`
 include::{include-path}bhd.key[]
 
 === `{sheldonh}`
 include::{include-path}sheldonh.key[]
 
 === `{mikeh}`
 include::{include-path}mikeh.key[]
 
 === `{mheinen}`
 include::{include-path}mheinen.key[]
 
 === `{niels}`
 include::{include-path}niels.key[]
 
 === `{ghelmer}`
 include::{include-path}ghelmer.key[]
 
 === `{mux}`
 include::{include-path}mux.key[]
 
 === `{wen}`
 include::{include-path}wen.key[]
 
 === `{dhn}`
 include::{include-path}dhn.key[]
 
 === `{jhibbits}`
 include::{include-path}jhibbits.key[]
 
 === `{jhixson}`
 include::{include-path}jhixson.key[]
 
 === `{pho}`
 include::{include-path}pho.key[]
 
 === `{oh}`
 include::{include-path}oh.key[]
 
 === `{mhorne}`
 include::{include-path}mhorne.key[]
 
 === `{bhughes}`
 include::{include-path}bhughes.key[]
 
 === `{sunpoet}`
 include::{include-path}sunpoet.key[]
 
 === `{lwhsu}`
 include::{include-path}lwhsu.key[]
 
 === `{foxfair}`
 include::{include-path}foxfair.key[]
 
 === `{whu}`
 include::{include-path}whu.key[]
 
 === `{chinsan}`
 include::{include-path}chinsan.key[]
 
 === `{davide}`
 include::{include-path}davide.key[]
 
 === `{jkh}`
 include::{include-path}jkh.key[]
 
 === `{versus}`
 include::{include-path}versus.key[]
 
 === `{pi}`
 include::{include-path}pi.key[]
 
 === `{weongyo}`
 include::{include-path}weongyo.key[]
 
 === `{peterj}`
 include::{include-path}peterj.key[]
 
 === `{jinmei}`
 include::{include-path}jinmei.key[]
 
 === `{ahze}`
 include::{include-path}ahze.key[]
 
 === `{markj}`
 include::{include-path}markj.key[]
 
 === `{trevor}`
 include::{include-path}trevor.key[]
 
 === `{erj}`
 include::{include-path}erj.key[]
 
 === `{allanjude}`
 include::{include-path}allanjude.key[]
 
 === `{bjk}`
 include::{include-path}bjk.key[]
 
 === `{phk}`
 include::{include-path}phk.key[]
 
 === `{pluknet}`
 include::{include-path}pluknet.key[]
 
 === `{cokane}`
 include::{include-path}cokane.key[]
 
 === `{karels}`
 include::{include-path}karels.key[]
 
 === `{kato}`
 include::{include-path}kato.key[]
 
 === `{vkashyap}`
 include::{include-path}vkashyap.key[]
 
 === `{pkubaj}`
 include::{include-path}pkubaj.key[]
 
 === `{kris}`
 include::{include-path}kris.key[]
 
 === `{keramida}`
 include::{include-path}keramida.key[]
 
 === `{fjoe}`
 include::{include-path}fjoe.key[]
 
 === `{manolis}`
 include::{include-path}manolis.key[]
 
 === `{stevek}`
 include::{include-path}stevek.key[]
 
 === `{jkim}`
 include::{include-path}jkim.key[]
 
 === `{zack}`
 include::{include-path}zack.key[]
 
 === `{jceel}`
 include::{include-path}jceel.key[]
 
 === `{andreas}`
 include::{include-path}andreas.key[]
 
 === `{kai}`
 include::{include-path}kai.key[]
 
 === `{jkois}`
 include::{include-path}jkois.key[]
 
 === `{sergei}`
 include::{include-path}sergei.key[]
 
 === `{maxim}`
 include::{include-path}maxim.key[]
 
 === `{taras}`
 include::{include-path}taras.key[]
 
 === `{tobik}`
 include::{include-path}tobik.key[]
 
 === `{jkoshy}`
 include::{include-path}jkoshy.key[]
 
 === `{wkoszek}`
 include::{include-path}wkoszek.key[]
 
 === `{ak}`
 include::{include-path}ak.key[]
 
 === `{gabor}`
 include::{include-path}gabor.key[]
 
 === `{anchie}`
 include::{include-path}anchie.key[]
 
 === `{rushani}`
 include::{include-path}rushani.key[]
 
 === `{kuriyama}`
 include::{include-path}kuriyama.key[]
 
 === `{rene}`
 include::{include-path}rene.key[]
 
 === `{jlaffaye}`
 include::{include-path}jlaffaye.key[]
 
 === `{clement}`
 include::{include-path}clement.key[]
 
 === `{mlaier}`
 include::{include-path}mlaier.key[]
 
 === `{martymac}`
 include::{include-path}martymac.key[]
 
 === `{glarkin}`
 include::{include-path}glarkin.key[]
 
 === `{dru}`
 include::{include-path}dru.key[]
 
 === `{lawrance}`
 include::{include-path}lawrance.key[]
 
 === `{njl}`
 include::{include-path}njl.key[]
 
 === `{jlh}`
 include::{include-path}jlh.key[]
 
 === `{leeym}`
 include::{include-path}leeym.key[]
 
 === `{sam}`
 include::{include-path}sam.key[]
 
 === `{jylefort}`
 include::{include-path}jylefort.key[]
 
 === `{grog}`
 include::{include-path}grog.key[]
 
 === `{oliver}`
 include::{include-path}oliver.key[]
 
 === `{netchild}`
 include::{include-path}netchild.key[]
 
 === `{leitao}`
 include::{include-path}leitao.key[]
 
 === `{ae}`
 include::{include-path}ae.key[]
 
 === `{lesi}`
 include::{include-path}lesi.key[]
 
 === `{achim}`
 include::{include-path}achim.key[]
 
 === `{cel}`
 include::{include-path}cel.key[]
 
 === `{glewis}`
 include::{include-path}glewis.key[]
 
 === `{vishwin}`
 include::{include-path}vishwin.key[]
 
 === `{delphij}`
 include::{include-path}delphij.key[]
 
 === `{avatar}`
 include::{include-path}avatar.key[]
 
 === `{ijliao}`
 include::{include-path}ijliao.key[]
 
 === `{rlibby}`
 include::{include-path}rlibby.key[]
 
 === `{pclin}`
 include::{include-path}pclin.key[]
 
 === `{yzlin}`
 include::{include-path}yzlin.key[]
 
 === `{linimon}`
 include::{include-path}linimon.key[]
 
 === `{arved}`
 include::{include-path}arved.key[]
 
 === `{dryice}`
 include::{include-path}dryice.key[]
 
 === `{nemoliu}`
 include::{include-path}nemoliu.key[]
 
 === `{kevlo}`
 include::{include-path}kevlo.key[]
 
 === `{zml}`
 include::{include-path}zml.key[]
 
 === `{nox}`
 include::{include-path}nox.key[]
 
 === `{avl}`
 include::{include-path}avl.key[]
 
 === `{scottl}`
 include::{include-path}scottl.key[]
 
 === `{rmacklem}`
 include::{include-path}rmacklem.key[]
 
 === `{vmaffione}`
 include::{include-path}vmaffione.key[]
 
 === `{bmah}`
 include::{include-path}bmah.key[]
 
 === `{rm}`
 include::{include-path}rm.key[]
 
 === `{mtm}`
 include::{include-path}mtm.key[]
 
 === `{dwmalone}`
 include::{include-path}dwmalone.key[]
 
 === `{marino}`
 include::{include-path}marino.key[]
 
 === `{cherry}`
 include::{include-path}cherry.key[]
 
 === `{matusita}`
 include::{include-path}matusita.key[]
 
 === `{mm}`
 include::{include-path}mm.key[]
 
 === `{sem}`
 include::{include-path}sem.key[]
 
 === `{mckusick}`
 include::{include-path}mckusick.key[]
 
 === `{tmclaugh}`
 include::{include-path}tmclaugh.key[]
 
 === `{jmelo}`
 include::{include-path}jmelo.key[]
 
 === `{mmel}`
 include::{include-path}mmel.key[]
 
 === `{jmmv}`
 include::{include-path}jmmv.key[]
 
 === `{kadesai}`
 include::{include-path}kadesai.key[]
 
 === `{ken}`
 include::{include-path}ken.key[]
 
 === `{markm}`
 include::{include-path}markm.key[]
 
 === `{dinoex}`
 include::{include-path}dinoex.key[]
 
 === `{sanpei}`
 include::{include-path}sanpei.key[]
 
 === `{rmh}`
 include::{include-path}rmh.key[]
 
 === `{driesm}`
 include::{include-path}driesm.key[]
 
 === `{jrm}`
 include::{include-path}jrm.key[]
 
 === `{freqlabs}`
 include::{include-path}freqlabs.key[]
 
 === `{mmoll}`
 include::{include-path}mmoll.key[]
 
 === `{cmt}`
 include::{include-path}cmt.key[]
 
 === `{stephen}`
 include::{include-path}stephen.key[]
 
 === `{marcel}`
 include::{include-path}marcel.key[]
 
 === `{dougm}`
 include::{include-path}dougm.key[]
 
 === `{kmoore}`
 include::{include-path}kmoore.key[]
 
 === `{marck}`
 include::{include-path}marck.key[]
 
+=== `{mav}`
+include::{include-path}mav.key[]
+
 === `{rich}`
 include::{include-path}rich.key[]
 
 === `{knu}`
 include::{include-path}knu.key[]
 
 === `{tmm}`
 include::{include-path}tmm.key[]
 
 === `{max}`
 include::{include-path}max.key[]
 
 === `{maho}`
 include::{include-path}maho.key[]
 
 === `{yoichi}`
 include::{include-path}yoichi.key[]
 
 === `{bland}`
 include::{include-path}bland.key[]
 
 === `{gnn}`
 include::{include-path}gnn.key[]
 
 === `{khng}`
 include::{include-path}khng.key[]
 
 === `{simon}`
 include::{include-path}simon.key[]
 
 === `{rnoland}`
 include::{include-path}rnoland.key[]
 
 === `{anders}`
 include::{include-path}anders.key[]
 
 === `{lofi}`
 include::{include-path}lofi.key[]
 
 === `{obrien}`
 include::{include-path}obrien.key[]
 
 === `{olgeni}`
 include::{include-path}olgeni.key[]
 
 === `{philip}`
 include::{include-path}philip.key[]
 
 === `{jpaetzel}`
 include::{include-path}jpaetzel.key[]
 
 === `{hiren}`
 include::{include-path}hiren.key[]
 
 === `{hmp}`
 include::{include-path}hmp.key[]
 
 === `{fluffy}`
 include::{include-path}fluffy.key[]
 
 === `{sat}`
 include::{include-path}sat.key[]
 
 === `{np}`
 include::{include-path}np.key[]
 
 === `{royger}`
 include::{include-path}royger.key[]
 
 === `{rpaulo}`
 include::{include-path}rpaulo.key[]
 
 === `{rpokala}`
 include::{include-path}rpokala.key[]
 
 === `{mp}`
 include::{include-path}mp.key[]
 
 === `{roam}`
 include::{include-path}roam.key[]
 
 === `{den}`
 include::{include-path}den.key[]
 
 === `{csjp}`
 include::{include-path}csjp.key[]
 
 === `{gerald}`
 include::{include-path}gerald.key[]
 
 === `{scottph}`
 include::{include-path}scottph.key[]
 
 === `{jacula}`
 include::{include-path}jacula.key[]
 
 === `{0mp}`
 include::{include-path}0mp.key[]
 
 === `{jdp}`
 include::{include-path}jdp.key[]
 
 === `{krion}`
 include::{include-path}krion.key[]
 
 === `{sepotvin}`
 include::{include-path}sepotvin.key[]
 
 === `{cpm}`
 include::{include-path}cpm.key[]
 
 === `{markp}`
 include::{include-path}markp.key[]
 
 === `{alepulver}`
 include::{include-path}alepulver.key[]
 
 === `{kp}`
 include::{include-path}kp.key[]
 
 === `{thomas}`
 include::{include-path}thomas.key[]
 
 === `{hq}`
 include::{include-path}hq.key[]
 
 === `{bofh}`
 include::{include-path}bofh.key[]
 
 === `{fox}`
 include::{include-path}fox.key[]
 
 === `{lbr}`
 include::{include-path}lbr.key[]
 
 === `{crees}`
 include::{include-path}crees.key[]
 
 === `{rees}`
 include::{include-path}rees.key[]
 
 === `{mr}`
 include::{include-path}mr.key[]
 
 === `{bcr}`
 include::{include-path}bcr.key[]
 
 === `{trhodes}`
 include::{include-path}trhodes.key[]
 
 === `{benno}`
 include::{include-path}benno.key[]
 
 === `{beech}`
 include::{include-path}beech.key[]
 
 === `{roberto}`
 include::{include-path}roberto.key[]
 
 === `{rodrigc}`
 include::{include-path}rodrigc.key[]
 
 === `{ler}`
 include::{include-path}ler.key[]
 
 === `{leres}`
 include::{include-path}leres.key[]
 
 === `{robak}`
 include::{include-path}robak.key[]
 
 === `{guido}`
 include::{include-path}guido.key[]
 
 === `{rea}`
 include::{include-path}rea.key[]
 
 === `{ray}`
 include::{include-path}ray.key[]
 
 === `{niklas}`
 include::{include-path}niklas.key[]
 
 === `{salvadore}`
 include::{include-path}salvadore.key[]
 
 === `{bsam}`
 include::{include-path}bsam.key[]
 
 === `{marks}`
 include::{include-path}marks.key[]
 
 === `{bschmidt}`
 include::{include-path}bschmidt.key[]
 
 === `{wosch}`
 include::{include-path}wosch.key[]
 
 === `{cy}`
 include::{include-path}cy.key[]
 
 === `{das}`
 include::{include-path}das.key[]
 
 === `{scheidell}`
 include::{include-path}scheidell.key[]
 
 === `{matthew}`
 include::{include-path}matthew.key[]
 
 === `{tmseck}`
 include::{include-path}tmseck.key[]
 
 === `{johans}`
 include::{include-path}johans.key[]
 
 === `{bakul}`
 include::{include-path}bakul.key[]
 
 === `{gshapiro}`
 include::{include-path}gshapiro.key[]
 
 === `{wxs}`
 include::{include-path}wxs.key[]
 
 === `{nork}`
 include::{include-path}nork.key[]
 
 === `{syrinx}`
 include::{include-path}syrinx.key[]
 
 === `{vanilla}`
 include::{include-path}vanilla.key[]
 
 === `{ashish}`
 include::{include-path}ashish.key[]
 
 === `{asiciliano}`
 include::{include-path}asiciliano.key[]
 
 === `{chs}`
 include::{include-path}chs.key[]
 
 === `{bms}`
 include::{include-path}bms.key[]
 
 === `{demon}`
 include::{include-path}demon.key[]
 
 === `{jesper}`
 include::{include-path}jesper.key[]
 
 === `{scop}`
 include::{include-path}scop.key[]
 
 === `{anray}`
 include::{include-path}anray.key[]
 
 === `{flo}`
 include::{include-path}flo.key[]
 
 === `{glebius}`
 include::{include-path}glebius.key[]
 
 === `{kensmith}`
 include::{include-path}kensmith.key[]
 
 === `{ben}`
 include::{include-path}ben.key[]
 
 === `{des}`
 include::{include-path}des.key[]
 
 === `{sobomax}`
 include::{include-path}sobomax.key[]
 
 === `{asomers}`
 include::{include-path}asomers.key[]
 
 === `{brian}`
 include::{include-path}brian.key[]
 
 === `{sson}`
 include::{include-path}sson.key[]
 
 === `{nsouch}`
 include::{include-path}nsouch.key[]
 
 === `{ssouhlal}`
 include::{include-path}ssouhlal.key[]
 
 === `{loos}`
 include::{include-path}loos.key[]
 
 === `{brnrd}`
 include::{include-path}brnrd.key[]
 
 === `{rink}`
 include::{include-path}rink.key[]
 
 === `{vsevolod}`
 include::{include-path}vsevolod.key[]
 
 === `{pstef}`
 include::{include-path}pstef.key[]
 
 === `{zi}`
 include::{include-path}zi.key[]
 
 === `{lstewart}`
 include::{include-path}lstewart.key[]
 
 === `{murray}`
 include::{include-path}murray.key[]
 
 === `{vs}`
 include::{include-path}vs.key[]
 
 === `{xride}`
 include::{include-path}xride.key[]
 
 === `{marius}`
 include::{include-path}marius.key[]
 
 === `{cs}`
 include::{include-path}cs.key[]
 
 === `{clsung}`
 include::{include-path}clsung.key[]
 
 === `{gsutter}`
 include::{include-path}gsutter.key[]
 
 === `{metal}`
 include::{include-path}metal.key[]
 
 === `{ryusuke}`
 include::{include-path}ryusuke.key[]
 
 === `{nyan}`
 include::{include-path}nyan.key[]
 
 === `{sahil}`
 include::{include-path}sahil.key[]
 
 === `{tota}`
 include::{include-path}tota.key[]
 
 === `{romain}`
 include::{include-path}romain.key[]
 
 === `{eduardo}`
 include::{include-path}eduardo.key[]
 
 === `{sylvio}`
 include::{include-path}sylvio.key[]
 
 === `{itetcu}`
 include::{include-path}itetcu.key[]
 
 === `{mi}`
 include::{include-path}mi.key[]
 
 === `{gordon}`
 include::{include-path}gordon.key[]
 
 === `{lth}`
 include::{include-path}lth.key[]
 
 === `{fabient}`
 include::{include-path}fabient.key[]
 
 === `{thierry}`
 include::{include-path}thierry.key[]
 
 === `{thompsa}`
 include::{include-path}thompsa.key[]
 
 === `{flz}`
 include::{include-path}flz.key[]
 
 === `{jilles}`
 include::{include-path}jilles.key[]
 
 === `{ganbold}`
 include::{include-path}ganbold.key[]
 
 === `{tuexen}`
 include::{include-path}tuexen.key[]
 
 === `{gonzo}`
 include::{include-path}gonzo.key[]
 
 === `{ume}`
 include::{include-path}ume.key[]
 
 === `{ups}`
 include::{include-path}ups.key[]
 
 === `{fsu}`
 include::{include-path}fsu.key[]
 
 === `{mikael}`
 include::{include-path}mikael.key[]
 
 === `{manu}`
 include::{include-path}manu.key[]
 
 === `{ram}`
 include::{include-path}ram.key[]
 
 === `{bryanv}`
 include::{include-path}bryanv.key[]
 
 === `{nectar}`
 include::{include-path}nectar.key[]
 
 === `{avilla}`
 include::{include-path}avilla.key[]
 
 === `{nivit}`
 include::{include-path}nivit.key[]
 
 === `{ivoras}`
 include::{include-path}ivoras.key[]
 
 === `{stefan}`
 include::{include-path}stefan.key[]
 
 === `{kaiw}`
 include::{include-path}kaiw.key[]
 
 === `{adamw}`
 include::{include-path}adamw.key[]
 
 === `{naddy}`
 include::{include-path}naddy.key[]
 
 === `{peter}`
 include::{include-path}peter.key[]
 
 === `{nwhitehorn}`
 include::{include-path}nwhitehorn.key[]
 
 === `{miwi}`
 include::{include-path}miwi.key[]
 
 === `{nate}`
 include::{include-path}nate.key[]
 
 === `{twinterg}`
 include::{include-path}twinterg.key[]
 
 === `{def}`
 include::{include-path}def.key[]
 
 === `{wollman}`
 include::{include-path}wollman.key[]
 
 === `{joerg}`
 include::{include-path}joerg.key[]
 
 === `{ygy}`
 include::{include-path}ygy.key[]
 
 === `{emax}`
 include::{include-path}emax.key[]
 
 === `{oshogbo}`
 include::{include-path}oshogbo.key[]
 
 === `{riggs}`
 include::{include-path}riggs.key[]
 
 === `{egypcio}`
 include::{include-path}egypcio.key[]
 
 === `{bz}`
 include::{include-path}bz.key[]
 
 === `{zeising}`
 include::{include-path}zeising.key[]
 
 === `{phantom}`
 include::{include-path}phantom.key[]
 
 === `{tz}`
 include::{include-path}tz.key[]
 
 === `{rigoletto}`
 include::{include-path}rigoletto.key[]
 
 === `{kaktus}`
 include::{include-path}kaktus.key[]
 
 === `{samm}`
 include::{include-path}samm.key[]
 
 === `{arrowd}`
 include::{include-path}arrowd.key[]
 
 [[pgpkeys-other]]
 == Other Cluster Account Holders
 
 === `{bk}`
 include::{include-path}bk.key[]
 
 === `{deb}`
 include::{include-path}deb.key[]
 
 === `{debdrup}`
 include::{include-path}debdrup.key[]
 
 === `{dutchdaemon}`
 include::{include-path}dutchdaemon.key[]
 
 === `{keymaster}`
 include::{include-path}keymaster.key[]
 
 === `{mwlucas}`
 include::{include-path}mwlucas.key[]
 
 === `{dhw}`
 include::{include-path}dhw.key[]
diff --git a/documentation/static/pgpkeys/mav.key b/documentation/static/pgpkeys/mav.key
new file mode 100644
index 0000000000..23eca2223c
--- /dev/null
+++ b/documentation/static/pgpkeys/mav.key
@@ -0,0 +1,111 @@
+// sh addkey.sh mav 8318C3955BAB227F ;
+
+[.literal-block-margin]
+....
+pub   rsa2048/8318C3955BAB227F 2014-07-02 [SC] [expires: 2025-03-21]
+      Key fingerprint = E98C F3C4 E69C C3CD 0E57  9D55 8318 C395 5BAB 227F
+uid                            Alexander Motin <mav@FreeBSD.org>
+uid                            Alexander Motin <mav@ixsystems.com>
+uid                            Alexander Motin <mav@mavhome.dp.ua>
+uid                            Alexander Motin <mavbsd@gmail.com>
+sub   rsa2048/0644E1A545DBCC15 2014-07-02 [E] [expires: 2025-03-21]
+
+....
+
+[.literal-block-margin]
+....
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+2LTLIdw38zM6jGwvmD6OMpc+OpnuVdR4iB+Y+1/cUSmbMmgWcQnf1ic4mqufu6+0
+I+1f2EYkr7tfgp3d3YzcwcY3Ud01YAyGA5L7apPNEr8YjR96D5+sV7H7127iCWCB
+OrrJH3eyvY9cFKnsknWvnooRAMMhEKTUxq4A4h4RJeQxgL5FPeryaRcXNMz/jQwm
+M4rSnvmg1ekDzqM+j77t0+d0YI0XDpjyPDa4lLQjQWxleGFuZGVyIE1vdGluIDxt
+YXZAbWF2aG9tZS5kcC51YT6JAT0EEwEKACcFAlOzyVoCGwMFCQWjmoAFCwkIBwMF
+FQoJCAsFFgMCAQACHgECF4AACgkQgxjDlVurIn/kQggAz+g5sxz3GEehTRS6fIRK
+ILwNWgM+vBtInlN+BoeYFKY1m31wtjX+QPYx/5iKSCNNqiwvq+1d7V5MV+YdhgRW
+jQzQneY4Q6Nrfne6FNCXouH1Af4h5cgFsaHGfM58KlS1WXV5GGtO2jsMDl2C82go
+Rk/1NQlof0jaMjuQkBpEDSbGzxE/R4dmeYQu0fCmu7+Sc3vSvUdfebY0TKPNeAPB
++GZ+6Lx0rqRpynSd9Mivm0Hr1fPb/og/cBwbpQOoPquNX17kfMiOTZ+ey1UpOPVU
+KNZAW/wTiF+0hL+yUL47s2tTasGhEE8mCT6ufNO0WO69WXCAOy7HRTvPAMDJfHIw
+aYkBVAQTAQoAPgIbAwULCQgHAwUVCgkICwUWAwIBAAIeAQIXgBYhBOmM88TmnMPN
+DledVYMYw5VbqyJ/BQJiOjayBQkUKg0mAAoJEIMYw5VbqyJ/zgQH/2jbzM3qNNRF
+ph6VHgF1qNBqxMCyl9hdWvMYGIuz2bZ2eBKvUPwO8TMivVfQHCv892ntjVpVU78i
+IbDmjrMFEdAuQW9B/KOB2iv6nY7GQWSwpPJeB4A1mlWMFxCJp6FbYMkvgXfaf6Mx
+Vj10ikyo1TcfSPuxPrFy3jBe7FUQXCDPGHDTdpmCo55u2GVuOxrukEjtJ3AcZH2O
+68bNV854/e7mlbqKwunGpmCbCtbeFaOK5yd7HR0VdxNruHupIIv1/NfqK6PobzyE
+VvU1p/uKnorrLsjPH+jn/qEXXz17A6gCDkgLnu2fGE7sitWMnXualUeZy8u8f6wX
+BJczcMnkHIy0IkFsZXhhbmRlciBNb3RpbiA8bWF2YnNkQGdtYWlsLmNvbT6JAT0E
+EwEKACcFAlOzyYsCGwMFCQWjmoAFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQ
+gxjDlVurIn94WAf9Hc0ndlTn/MQ9h1RjLr2WMko/uQp8mRTIlyQsrYPgHlOOqdvz
+xEGUOFgJGySmwl97NcLgYLgjZ3fUJuzNlloSQd6V4sh1cTGYQErrrv+v1Z/xayHq
+tkYKTLd56mI6tAsyQMYYITodr2MXpW3/lT9q0fELm5wYt6PSbbU5KOh8/2pLebUX
+keO4Oz8nG2Ch0vApaVcPds8mXiElDtAk27R4p21dY5sniUA5c4HBurUge71xophz
+5inHObBWfcLZxlyssKuVlRwvIJHiBjL4tLDkS+HJQj0avfFBTlbXfsbjvNH/0Ypw
+ZcZUNl8VYw/Ydep4zizyNEDzlf5pvygLq0s4O4kBVAQTAQoAPgIbAwULCQgHAwUV
+CgkICwUWAwIBAAIeAQIXgBYhBOmM88TmnMPNDledVYMYw5VbqyJ/BQJiOjayBQkU
+Kg0mAAoJEIMYw5VbqyJ/rt0IAIsxZJN0UwgeiOo+8A5VYsew3YKiCCRm13dSYI3K
+A4QH4HgzOdKocGJ3NKrSaXSWT7g1yBGgEjao9vNHIKsMmrFjH99/W4Vmem1bGDX9
+CNWy9h5rKmPz8KuyZofquHD5MN/9IqJK0B4WIuJnZ8wvf4UNwk73rUEwGKLTuxXG
+LV8cqTYIfcVrlWtnkTZtS/01saRoOgQ4WZAmjuwHacbHipWLLH1ck/CSTRMZQRzH
+WGG63i6ZoeNRfDUHoHhhUKiMezmh3k8AHM73aI9NQ9YOrto/uZ6oVF+p++y1IBuH
+IzHCE9MDUISj1Bsh97OAqFMoJJmw2rXSNSErtXVmTatvTHq5AQ0EU7PEDAEIAOZg
+Wf2cJIu+58IzP2dkXE/urj3tr4OqrB/yHGWUf71Lz6D0Fi6ZAXgDtmcFLGPfMyWu
+LAvSM+xmoguk7zC4hRBYvQycmIhuqBq1jO1Wp/Z+lpoPM/1cDYLn8FlvmI/c40Mh
+UZh345DA4jYWWaZNjQHUWVQ1fPf595vdVVMPT/abE8E5DaF6fSkRmqFTmfYRkfbt
+3ytU8NdUapDcJVY7cEP2nJBVNZPnOIObR/ZIgSxjjrG5o34yXoqeup8JvwEv+/Ny
+lzzuyXEZR1EdEIzQ/a1nh/0j4NXtzZEqKW4aTWlmSqb6wN8jh1OSOOqkYsfnE3nf
+xcZbxi4IRoNQYlm59R8AEQEAAYkBJQQYAQoADwUCU7PEDAIbDAUJBaOagAAKCRCD
+GMOVW6sif7FRB/4k9y/GaGqUfcJiXdQHRAKHCUvbKMFgeEDHOg33qx+POS2Ah85/
+PXVa2jYBldCZDmYc+zl48aEMd163a7s30gJaB7CYElwxlKUk6c+5gwoYIJuJJzSz
+W0JzSD5ch7RIRxbfxrKdsiHrUW8AeduZWzlK6VaWRmWILgLmxfLdhEVFWxbr99GS
+eVFZaZwn6tl/8CvBcgYoARvJvl0V5zS1akQfEISYkwL9EfUIW44EOHranL5qUXke
+dXBYp6fRsooGrIimfwYxaC8FbXhk3FMgMjDMRiVq4POHo1iGeYETsUrLNM6184E2
+5gPVtX2fb3RhM8Xh6BkwCZ6ZYbQ+AcD4F/cKiQE8BBgBCgAmAhsMFiEE6YzzxOac
+w80OV51VgxjDlVurIn8FAmI6NsgFCRQqDTwACgkQgxjDlVurIn+tfAf/ZRoftnvz
+3f64Q+jbSAmTD3jEPDkWOL0zyks2l+IXt0pd8kxR7ZPQnesdloyVKHLoiYNz8iR6
+3Gr4q8FZriZZqMRlzEWt6+G5B7YAs74Zpu9PanT74vhCAT5ZezeXBqyTjCtzh/9p
+EEcpZaBdZ5XBzc65NyGrg7kBjHOCPISbBmyGt03mzOnM2Dr68U7g1aIyGW94NQuO
+1cSpcklzbB4hbRGlQh8KntgtUL4V/WPr7sN96Iz1apZc8fOYpq3BbCWTyu8Mwxne
+BLLBcvfYulYpTvpshbEHrDW7KQOTrjezBlMbRfKg5mBgfprz3fXLTomeDnRcBFch
+ibz4uB+lMxak2Q==
+=xrhF
+-----END PGP PUBLIC KEY BLOCK-----
+....