diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index a90caf3672..91e5fa5e06 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -355,7 +355,7 @@ AddFilesToHaikuImage system data Canna dic canna : $(cannaDicCanna) ;
 AddDirectoryToHaikuImage system data Canna dic group ;
 AddDirectoryToHaikuImage system data Canna dic user ;
 
-local keymapFiles = [ GLOB [ FDirName $(HAIKU_TOP) src data etc keymaps ]
+local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data etc keymaps ]
 	: *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
 AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
@@ -363,6 +363,11 @@ AddSymlinkToHaikuImage system data Keymaps : Swedish : Finnish ;
 AddSymlinkToHaikuImage system data Keymaps : Slovene : Croatian ;
 AddSymlinkToHaikuImage system data Keymaps : US-International : Brazilian ;
 
+local keyboardLayoutsDir
+	= [ FDirName $(HAIKU_TOP) data system data KeyboardLayouts ] ;
+local keyboardLayouts = [ Glob $(keyboardLayoutsDir) : [^.]* ] ;
+AddFilesToHaikuImage system data KeyboardLayouts : $(keyboardLayouts) ;
+
 local timezones = [ FTimeZoneBinaries $(HAIKU_TIME_ZONE_SOURCES) : : true ] ;
 for timezone in $(timezones) {
 	local dir = [ on $(timezone) return $(RELATIVE_TIMEZONE_DIR) ] ;