diff --git a/src/image.rs b/src/image.rs
index d1cf535..3f49042 100644
--- a/src/image.rs
+++ b/src/image.rs
@@ -524,7 +524,7 @@ fn collect_files(cfg: &Config, _disc: &Discovery) -> Result<Vec<FileEntry>> {
         "neoshell", "neoinit", "cmdtest", "cd", "corehelp",
         "datetime", "neomem", "echo", "label",
         "coretype", "corecls", "corecopy", "coredel",
-        "coreren", "coremd", "corerd", "drives", "ps", "keyb", "coredir",
+        "coreren", "coremd", "corerd", "drives", "ps", "coredir",
         "poweroff", "colors", "neokey",
         "nxres", "nxlocale", "nxverify", "ping", "hostname",
     ];
@@ -585,7 +585,9 @@ fn collect_files(cfg: &Config, _disc: &Discovery) -> Result<Vec<FileEntry>> {
         println!("  NXL packed: /System/Libraries/{}", dst);
     }
 
-    let kbd_layouts = &["US", "Spanish"];
+    // Enabled layouts shipped in /System/Keyboard. Generate all locales with
+    // scripts/gen-keyboard-layouts.sh; more are enabled once #709 is fixed.
+    let kbd_layouts = &["en-US", "es-ES"];
     for layout_name in kbd_layouts {
         let p = root.join("data/keyboard").join(format!("{}.kbd", layout_name));
         if p.exists() {