diff --git a/documentation/static/pgpkeys/vmaffione.key b/documentation/static/pgpkeys/vmaffione.key
index ecdf5418a8..d9b5f6498f 100644
--- a/documentation/static/pgpkeys/vmaffione.key
+++ b/documentation/static/pgpkeys/vmaffione.key
@@ -1,53 +1,57 @@
-<!--
-sh addkey.sh vmaffione 3A3F58253F30A245 ;
--->
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpfingerprint"><![CDATA[
+//
+// sh addkey.sh vmaffione 3A3F58253F30A245 ;
+
+
+[.literal-block-margin]
+....
 pub   3072R/3A3F58253F30A245 2021-02-01 [expires: 2024-02-01]
       Key fingerprint = E42A 54BD 67B3 5721 1641  B144 3A3F 5825 3F30 A245
 uid                          Vincenzo Maffione <vmaffione@freebsd.org>
 sub   3072R/77769E9A73B79B2B 2021-02-01 [expires: 2024-02-01]
 
-]]></programlisting>
-<programlisting xmlns="http://docbook.org/ns/docbook" role="pgpkey"><![CDATA[
+....
+
+[.literal-block-margin]
+....
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 
 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
 =re6k
 -----END PGP PUBLIC KEY BLOCK-----
-]]></programlisting>
+....