5 files changed, 8 insertions, 3 deletions

diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4
index a90b19b892f9..6d63045c927c 100644
--- a/share/man/man4/syscons.4
+++ b/share/man/man4/syscons.4
@@ -132,7 +132,7 @@ dump the current keymap, and assign a string to a function key.
 See
 .Xr keyboard 4
 and
-.Xr keymap 5
+.Xr kbdmap 5
 for the keymap file.
 .Pp
 You may want to set the
@@ -477,7 +477,7 @@ This manual page is incomplete and urgently needs revision.
 .Xr splash 4 ,
 .Xr ukbd 4 ,
 .Xr vga 4 ,
-.Xr keymap 5 ,
+.Xr kbdmap 5 ,
 .Xr rc.conf 5 ,
 .Xr screenmap 5 ,
 .Xr ttys 5 ,
diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile
index ad91cb0ee68b..90cfb6a0d745 100644
--- a/usr.sbin/kbdcontrol/Makefile
+++ b/usr.sbin/kbdcontrol/Makefile
@@ -1,5 +1,7 @@
+# $FreeBSD$
 PROG=	kbdcontrol
 SRCS=	kbdcontrol.c lex.l
+MAN5=	kbdmap.5
 DPADD+=	${LIBL}
 LDADD+=	-ll
 
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.1 b/usr.sbin/kbdcontrol/kbdcontrol.1
index c33eddc00659..1f8bfa78efac 100644
--- a/usr.sbin/kbdcontrol/kbdcontrol.1
+++ b/usr.sbin/kbdcontrol/kbdcontrol.1
@@ -217,6 +217,7 @@ Report when found.
 .Xr screen 4 ,
 .Xr syscons 4 ,
 .Xr ukbd 4 ,
+.Xr kbdmap 5 ,
 .Xr rc.conf 5
 .Sh AUTHORS
 .An Søren Schmidt Aq sos@FreeBSD.org
diff --git a/usr.sbin/kbdmap/TODO b/usr.sbin/kbdmap/TODO
index 0735569dac69..cef30f79ba1b 100644
--- a/usr.sbin/kbdmap/TODO
+++ b/usr.sbin/kbdmap/TODO
@@ -1,4 +1,5 @@
-o kbdmap.5 man page
+$FreeBSD$
+
 o remember some hackers to translate Languages.phrases into
   Norwegian, Russian, Danish, Swedish
 
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index ae8d35eb3417..77eaa0390ee7 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -128,6 +128,7 @@ work only on a (virtual) console and not with
 .Xr dialog 1 ,
 .Xr kbdcontrol 1 ,
 .Xr vidcontrol 1 ,
+.Xr kbdmap 5 ,
 .Xr rc.conf 5
 .Sh HISTORY
 The