diff --git a/.gitignore b/.gitignore
index c61abc7f..b41afbf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ config/*.old
 *~
 crossgcc
 clean
-*.map
 *.sec
 *.dep
 *.ffs
diff --git a/initrd/.ash_history b/initrd/.ash_history
index 99690053..64a5e181 100644
--- a/initrd/.ash_history
+++ b/initrd/.ash_history
@@ -15,3 +15,6 @@ seal-totp
 #Verify Intel ME state:
 cbmem --console | grep '^ME'
 cbmem --console | less
+# Reboot/power off (important for devices with no keyboard to escape recovery shell)
+reboot
+poweroff
diff --git a/modules/kbd b/modules/kbd
index 6067a996..f6d3f405 100644
--- a/modules/kbd
+++ b/modules/kbd
@@ -1,3 +1,11 @@
+# kbd: Linux keyboard tools
+#
+# Provides:
+# - setfont - set the Linux console font
+# - loadkeys - load a key map for the Linux console (CONFIG_KBD_LOADKEYS)
+#
+# To also provide showkey and dumpkeys (normally only needed for development),
+# set CONFIG_KBD_DEVTOOLS=y.
 modules-$(CONFIG_KBD) += kbd
 
 kbd_version := 2.6.1
@@ -21,4 +29,12 @@ kbd_target := \
 kbd_output := \
 	src/setfont
 
+ifeq "$(CONFIG_KBD_LOADKEYS)" "y"
+	kbd_output += src/loadkeys
+endif
+
+ifeq "$(CONFIG_KBD_EXTRATOOLS)" "y"
+	kbd_output += src/showkey src/dumpkeys
+endif
+
 kbd_depends := $(musl_dep)