diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index 386f01256..d9a59af3c 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -18,14 +18,15 @@
 # Some macros can have optional {0} value, that is what
 # the {0%...} and {0#...} handles.
 
-[attributes]
-squote=@squote@
-
 #############################################################################
 # DocBook
 
 ifdef::backend-docbook[]
 
+# To be replaced later
+[attributes]
+squote=@squote@
+
 # No interlinking between elinks manpages
 [man-inlinemacro]
 {0%{target}}
@@ -54,6 +55,9 @@ endif::backend-docbook[]
 
 ifdef::backend-xhtml11[]
 
+[attributes]
+squote='
+
 # Use the man:[] macro to link between elinks manpages
 [man-inlinemacro]
 <a href="{target}.{0}.html">{target}({0})</a>
diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5
index ebc1e5786..c0914f083 100644
--- a/doc/man/man5/elinks.conf.5
+++ b/doc/man/man5/elinks.conf.5
@@ -17,7 +17,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "ELINKS.CONF" 5 "" "" ""
+.TH "ELINKS.CONF" 5 "ELinks configuration file" "2006-01-12" "ELinks configuration file"
 .SH NAME
 elinks.conf \- ELinks configuration file
 .SH "SYNOPSIS"