diff --git a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
index 251c1230f9..6c7461fb6f 100644
--- a/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/config/default_settings.xml
@@ -25,4 +25,5 @@
+
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
index 0128e8d0e6..ca62f7c5d1 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Dutch/strings.xml
@@ -5,6 +5,7 @@
Systeem
Toetsenbord
Toetsenbord layout
+ Toetsenbord layout #2
Systeem update
Systeem update
LCD/VFD Driver
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
index b44f15069b..0332bf6a38 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/English/strings.xml
@@ -4,7 +4,8 @@
System
Keyboard
- Keyboardlayout
+ Keyboard layout
+ Alternate keyboard layout (optional)
System Update
System Update
LCD/VFD
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
index 222ac77471..7931a6d696 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/French/strings.xml
@@ -5,6 +5,7 @@
Système
Clavier
Clavier
+ Clavier alternatif (facultatif)
Mise à jour du système
Mise à jour du système
LCD/VFD
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
index dfa72085ea..f31633a4b4 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/German/strings.xml
@@ -5,6 +5,7 @@
System
Tastatur
Tastaturlayout
+Tastaturlayout #2
System Aktualisierung
System Aktualisierung
LCD/VFD
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
index 5d4d245cfe..bc59a1a486 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/language/Norwegian/strings.xml
@@ -5,6 +5,7 @@
System
Tastatur
Språklayout
+ Språklayout #2
Systemoppdateringer
Systemoppdateringer
LCD/VFD
@@ -48,4 +49,4 @@
Oppstart
Start SABnzbd under oppstart
-
\ No newline at end of file
+
diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
index c804349a18..00be2bba7e 100644
--- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
+++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml
@@ -6,6 +6,7 @@
+
diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/init.d/72_keyboard
index 5279e95762..351f8875e0 100644
--- a/packages/x11/app/setxkbmap/init.d/72_keyboard
+++ b/packages/x11/app/setxkbmap/init.d/72_keyboard
@@ -36,6 +36,10 @@
wait_for_xorg
# setup keymap
- setxkbmap -display $DISPLAY $X11_KEYMAP
+ if [ -z $X11_KEYMAP2 ]; then
+ setxkbmap -display $DISPLAY $X11_KEYMAP;
+ else
+ setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle";
+ fi
fi
)&