diff --git a/doc/Makefile b/doc/Makefile
index 3a633560..85138f21 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -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
diff --git a/doc/elinkskeys.5.txt b/doc/elinkskeys.5.txt
index 3fde5b01..d5323075 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/tools/keys2doc b/doc/tools/keys2doc
index e4b537e8..aa031075 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