diff --git a/common.inc b/common.inc
index 8461dc6..45718a2 100644
--- a/common.inc
+++ b/common.inc
@@ -366,23 +366,23 @@
       } if
     } if
 
-    config.keymap .km.name get dup "us" ne {
+    config.lang "en" ne config.keymap .km.name get "us" ne or {
+      /keymap.op keymap.explicit { "=" } { "?=" } ifelse def
+      config.keymap .km.name get
       dup "_" strstr dup 0 eq {
         pop
-        "console-setup/layoutcode=%s " bc.cmd dup length add sprintf
+        keymap.op "console-setup/layoutcode%s%s " bc.cmd dup length add sprintf
       } {
         over over 1 sub 0 put
-        over "console-setup/layoutcode=%s " bc.cmd dup length add sprintf
-        add "console-setup/variantcode=%s " bc.cmd dup length add sprintf
+        over keymap.op "console-setup/layoutcode%s%s " bc.cmd dup length add sprintf
+        add keymap.op "console-setup/variantcode%s%s " bc.cmd dup length add sprintf
       } ifelse
       config.keymap .km.model get dup {
-        "console-setup/modelcode=%s " bc.cmd dup length add sprintf
+        keymap.op "console-setup/modelcode%s%s " bc.cmd dup length add sprintf
       } {
         pop
       } ifelse
-    } {
-      pop
-    } ifelse
+    } if
 
     modes.selected.append .undef ne {
       modes.selected.append "%s " bc.cmd dup length add sprintf
diff --git a/debian/changelog b/debian/changelog
index 819e75a..16f36aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gfxboot-theme-ubuntu (0.6.4) UNRELEASED; urgency=low
+
+  * If the selected keymap is the default for the selected locale rather
+    than explicitly chosen, then preseed console-setup/* in such a way as to
+    not set the seen flag (LP: #64058).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 30 Jun 2008 23:55:22 +0100
+
 gfxboot-theme-ubuntu (0.6.3) intrepid; urgency=low
 
   * Update language names from localechooser 2.03ubuntu1, adding Amharic and
diff --git a/dia_keymap.inc b/dia_keymap.inc
index bab6998..b4bc295 100644
--- a/dia_keymap.inc
+++ b/dia_keymap.inc
@@ -6,6 +6,7 @@
 
 
 /keymap.inited false def
+/keymap.explicit false def
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 % Build keymap list.
@@ -55,6 +56,7 @@
   /xmenu xmenu.keymap def
 
   /config.keymap keymaps xmenu .xm_current get get def
+  /keymap.explicit true def
 
   window.action actRedraw eq { pmenu.update } if
 } def
diff --git a/locale.inc b/locale.inc
index 7f19417..eb8ac06 100644
--- a/locale.inc
+++ b/locale.inc
@@ -89,6 +89,7 @@
     } ifelse
   } if
 
+  /keymap.explicit false def
 } def