diff --git a/conf/common.rmk b/conf/common.rmk
index 82edc0aa0..e21c693b0 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -180,6 +180,13 @@ CLEANFILES += grub-pe2elf
 grub_macho2img_SOURCES = util/grub-macho2img.c
 CLEANFILES += grub-macho2img
 
+# For grub-kbdcomp
+grub-kbdcomp: util/grub-kbdcomp.in config.status
+	./config.status --file=$@:$<
+	chmod +x $@
+sbin_SCRIPTS += grub-kbdcomp
+CLEANFILES += grub-kbdcomp
+
 # For grub-mkconfig
 grub-mkconfig: util/grub-mkconfig.in config.status
 	./config.status --file=$@:$<
diff --git a/util/grub-kbdcomp.in b/util/grub-kbdcomp.in
new file mode 100644
index 000000000..87b24bcdf
--- /dev/null
+++ b/util/grub-kbdcomp.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+grub_mklayout=${bindir}/`echo grub-mklayout | sed ${transform}`
+
+ckbcomp "$@" | $grub_mklayout -o "$1".gkb
+