diff --git a/Makefile.lib b/Makefile.lib
index 8519a5856..b6c124af6 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -111,11 +111,13 @@ endif
 
 %.o: $(srcdir)%.c
 	$(call mcmd,compile)
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	@-if test -e .deps/$(*F).pp; then \
+		cp .deps/$(*F).pp .deps/$(*F).P; \
 		tr ' ' '\012' < .deps/$(*F).pp \
 			| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 			>> .deps/$(*F).P; \
-		rm .deps/$(*F).pp
+		rm .deps/$(*F).pp; \
+	fi
 
 CLEAN += $(PROG) $(OBJS)
 
diff --git a/doc/Makefile b/doc/Makefile
index 3a6335605..a421fb481 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -61,7 +61,7 @@ man:  txt $(MAN_DOCS)
 all-docs: man html pdf
 
 install-doc: all-docs update-man install
-	$(foreach doc,$(HTML_DOCS), \
+	@$(foreach doc,$(HTML_DOCS), \
 		if test -d $(doc); then \
 			$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(PACKAGE)/html/$(doc); \
 			$(call ncmd,installdata,$(doc)/*,$(HTML_DIR)/$(doc)); \
@@ -69,12 +69,12 @@ install-doc: all-docs update-man install
 			$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(PACKAGE)/html; \
 			$(call ncmd,installdata,$(doc),$(HTML_DIR)); \
 		fi;)
-	$(foreach doc,$(PDF_DOCS), \
+	@$(foreach doc,$(PDF_DOCS), \
 		$(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(PACKAGE)/pdf; \
 		$(call ncmd,installdata,$(doc),$(PDF_DIR);))
 
 update-man: man
-	$(if $(MAN_DOCS), \
+	@$(if $(MAN_DOCS), \
 		$(call ncmd,installdata,elinks.1,man/man1/elinks.1.in); \
 		$(call ncmd,installdata,elinkskeys.5,man/man5/); \
 		$(call ncmd,installdata,elinks.conf.5,man/man5/))
@@ -93,7 +93,7 @@ install-local:
 CODE2DOC = $(srcdir)tools/code2doc
 HELP2DOC = $(srcdir)tools/help2doc
 CONF2DOC = $(srcdir)tools/conf2doc
-KEYS2DOC = $(srcdir)tools/make-elinkskeys-manpage
+KEYS2DOC = $(srcdir)tools/keys2doc
 ELINKS	 = $(top_builddir)/src/elinks
 FEATURES = $(top_srcdir)/features.conf
 KBDBIND	 = $(top_srcdir)/src/config/kbdbind.c
@@ -177,19 +177,19 @@ man_hack = sed "s/^\(\.TH \"ELINKS[^\"]*\" [0-9] \).*/\1\"$(1)\" \"$(MAN_DATE)\"
 
 %.html: %.txt asciidoc.conf
 	$(call cmd,asciidoc,xhtml11)
-	$(call asciidoc_dep)
+	@-$(call asciidoc_dep)
 
 %.xml: %.txt asciidoc.conf
 	$(call cmd,asciidoc,docbook)
-	$(call asciidoc_dep)
+	@-$(call asciidoc_dep)
 
 %.1: %.1.xml
 	$(call cmd,xmlto,man)
-	$(call man_hack,$(call man_desc))
+	@$(call man_hack,$(call man_desc))
 
 %.5: %.5.xml
 	$(call cmd,xmlto,man)
-	$(call man_hack,$(call man_desc))
+	@$(call man_hack,$(call man_desc))
 
 %.html-chunked: %.xml
 	$(call cmd,xmlto,html,-o $@)
diff --git a/doc/asciidoc.conf b/doc/asciidoc.conf
index 9d8eb0ef8..ac0afaeb5 100644
--- a/doc/asciidoc.conf
+++ b/doc/asciidoc.conf
@@ -15,6 +15,9 @@
 # - typedef:[]
 # - ref:[]
 
+[replacements]
+(^|[^-])--($|[^-])=\1--\2
+
 # Some macros can have optional {0} value, that is what
 # the {0%...} and {0#...} handles.
 
diff --git a/doc/elinkskeys.5.txt b/doc/elinkskeys.5.txt
index 3fde5b018..d53230756 100644
--- a/doc/elinkskeys.5.txt
+++ b/doc/elinkskeys.5.txt
@@ -80,6 +80,16 @@ Some keys will need to be quoted or escaped. For example, space can be written
 as  `" "` (quote space quote), and the quote itself as `\"` (backslash quote).
 Backslash can be written as `\\` (double backslash).
 
+/////////////////////////////////////////////////////////////////////////////
+FIXME:
+
+ - You may prefix each of these keys with a number, telling its repeat count
+  (how many times to do it). You can also re-bind keys, see elinkskeys(5) for
+  documentation and a more complete list of keys  bound by default. 
+
+ - The following keys can be used while editing a line/jumping to a URL
+/////////////////////////////////////////////////////////////////////////////
+
 KEYMAP ACTIONS
 --------------
 
diff --git a/doc/man/man5/elinks.conf.5 b/doc/man/man5/elinks.conf.5
index db9ffa86c..fcd422df1 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 "ELinks configuration file" "2006-01-12" "ELinks configuration file"
+.TH "ELINKS.CONF" 5 "ELinks configuration file" "2006-01-14" "ELinks configuration file"
 .SH NAME
 elinks.conf \- ELinks configuration file
 .SH "SYNOPSIS"
@@ -742,7 +742,7 @@ Prevent overwriting the local files:
 0: is files will silently be overwritten
 .TP
 \(bu
-
+1: is add a suffix \&.{number} (for example '\&.1') to the name
 .TP
 \(bu
 2: is ask the user
diff --git a/doc/tools/help2doc b/doc/tools/help2doc
index 62255ecc4..2b48da28f 100755
--- a/doc/tools/help2doc
+++ b/doc/tools/help2doc
@@ -105,6 +105,7 @@ do
 		fi
 
 		line=`echo "$line" | sed -e "s/[ ]*(DISABLED)//"`
+		line=`echo "$line" | sed 's/\([{}]\)/\\\\\1/g'`
 		number=
 		if test -n "$parse_int_option";
 		then
diff --git a/doc/tools/keys2doc b/doc/tools/keys2doc
index e4b537e83..5e95eebc5 100755
--- a/doc/tools/keys2doc
+++ b/doc/tools/keys2doc
@@ -6,14 +6,6 @@
 # Copyright (c) Jonas Fonseca <fonseca@diku.dk>, 2005-2006
 #
 
-# FIXME:
-#
-# - You may prefix each of these keys with a number, telling its repeat count
-# (how many times to do it). You can also re-bind keys, see elinkskeys(5) for
-# documentation and a more complete list of keys  bound by default. 
-#
-# - The following keys can be used while editing a line/jumping to a URL
-
 KBDBIND=$1
 CONFIGDIR=$(dirname "$KBDBIND")
 OUTPUT=$2
@@ -22,6 +14,7 @@ test -d "$CONFIGDIR" || exit
 
 print_title()
 {
+	echo
 	echo "$1" | tr 'a-z' 'A-Z'
 	echo "$1" | sed 's/[^~]/~/g'
 	echo