diff --git a/kbd.changes b/kbd.changes
index 9d14d1e..f051bb2 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 21 14:07:36 CET 2011 - werner@suse.de
+
+- If /usr is located in a separate partition, the locale command fails.
+- Ignore /var/run/keymap in sinlge user mode otherwise key mapping
+  could be wrong if booted cold into sinlge user mode
+
 -------------------------------------------------------------------
 Thu Feb 17 12:39:06 CET 2011 - werner@suse.de
 
diff --git a/kbd.init b/kbd.init
index 1fe5e9d..1341b71 100644
--- a/kbd.init
+++ b/kbd.init
@@ -41,7 +41,7 @@ test -n "$KBD_VERBOSE" && set -x
 # XXX: is this really needed just for LOCALE_CHARMAP?
 test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile
 test -e /etc/profile.d/lang.sh  && . /etc/profile.d/lang.sh
-LOCALE_CHARMAP=`locale charmap`
+LOCALE_CHARMAP=`locale charmap 2>/dev/null`
 LC_ALL=POSIX
 
 KBDBASE="/usr/share/kbd"
@@ -164,7 +164,7 @@ case "$1" in
 		# this means that initialization was already done.
 		# don't do it twice unless forced, it may annoy xdm and
 		# produce lots of error messages.
-		test -s /var/run/keymap && exit 0
+		test -s /var/run/keymap -a "$RUNLEVEL" != S && exit 0
 	    ;;
 	esac