diff --git a/client/files/00-keyboard.conf b/client/files/00-keyboard.conf
new file mode 100644
index 0000000000000000000000000000000000000000..d093b604555b99381c1593aa3714686913604ac5
--- /dev/null
+++ b/client/files/00-keyboard.conf
@@ -0,0 +1,5 @@
+Section "InputClass"
+	Identifier "system-keyboard"
+	MatchIsKeyboard "on"
+	Option "XkbLayout" "de"
+EndSection
diff --git a/client/tasks/kde.yml b/client/tasks/kde.yml
index d49ba20e9a0b190a70942f708778ad09a11785cb..3fc250889ab46a99c4103ecfe163379c7d0a4356 100644
--- a/client/tasks/kde.yml
+++ b/client/tasks/kde.yml
@@ -89,6 +89,13 @@
   file: state=link src=/usr/share/xsessions/plasma.desktop dest=/usr/share/xsessions/default.desktop
   notify: restart sddm
 
+- name: ensure there is a x11 config folder
+  file: path=/etc/X11/xorg.conf.d state=directory owner=root group=root mode=775
+
+- name: ensure sddm has the correct keymap
+  copy: src=00-keyboard.conf dest=/etc/X11/xorg.conf.d/00-keyboard.conf owner=root group=root mode=0644
+  notify: restart sddm
+
 #- name: ensure deployment of a nice kdm theme
 #  copy: src=kdm/fsmpi_theme/ dest=/usr/share/kde4/apps/kdm/themes/fsmpi owner=root group=root mode=0644
 #