diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 0084d79..f5e6f57 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -4,14 +4,23 @@
 #
 # Note, {0} is the manpage section, while {target} is the command.
 #
-# Show guilt link as: <command>(<section>); if section is defined, else just show
-# the command.
+# Show guilt link as: <command>(<section>); if section is defined, else just
+# show the command.
+
+[macros]
+(?su)[\\]?(?P<name>linkguilt):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
 
 [attributes]
-caret=^
+asterisk=&#42;
+plus=&#43;
+caret=&#94;
 startsb=&#91;
 endsb=&#93;
+backslash=&#92;
 tilde=&#126;
+apostrophe=&#39;
+backtick=&#96;
+litdd=&#45;&#45;
 
 ifdef::backend-docbook[]
 [linkguilt-inlinemacro]
@@ -21,21 +30,45 @@ ifdef::backend-docbook[]
 {0#</citerefentry>}
 endif::backend-docbook[]
 
-
 ifdef::backend-docbook[]
+ifndef::guilt-asciidoc-no-roff[]
 # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
+# v1.72 breaks with this because it replaces dots not in roff requests.
 [listingblock]
 <example><title>{title}</title>
 <literallayout>
+ifdef::doctype-manpage[]
+&#10;.ft C&#10;
+endif::doctype-manpage[]
 |
+ifdef::doctype-manpage[]
+&#10;.ft&#10;
+endif::doctype-manpage[]
 </literallayout>
 {title#}</example>
-endif::backend-docbook[]
+endif::guilt-asciidoc-no-roff[]
 
-ifdef::backend-xhtml11[]
-[linkguilt-inlinemacro]
-<a href="{target}.html">{target}{0?({0})}</a>
-endif::backend-xhtml11[]
+ifdef::guilt-asciidoc-no-roff[]
+ifdef::doctype-manpage[]
+# The following two small workarounds insert a simple paragraph after screen
+[listingblock]
+<example><title>{title}</title>
+<literallayout>
+|
+</literallayout><simpara></simpara>
+{title#}</example>
+
+[verseblock]
+<formalpara{id? id="{id}"}><title>{title}</title><para>
+{title%}<literallayout{id? id="{id}"}>
+{title#}<literallayout>
+|
+</literallayout>
+{title#}</para></formalpara>
+{title%}<simpara></simpara>
+endif::doctype-manpage[]
+endif::guilt-asciidoc-no-roff[]
+endif::backend-docbook[]
 
 ifdef::doctype-manpage[]
 ifdef::backend-docbook[]
@@ -55,3 +88,8 @@ template::[header-declarations]
 </refnamediv>
 endif::backend-docbook[]
 endif::doctype-manpage[]
+
+ifdef::backend-xhtml11[]
+[linkguilt-inlinemacro]
+<a href="{target}.html">{target}{0?({0})}</a>
+endif::backend-xhtml11[]