data/Makefile.am      | 3 +++
 data/Xgreeter.lightdm | 4 ++++
 data/lightdm.conf     | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index c9f38f25..8a7c26c5 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -48,3 +48,6 @@ dist_man1_MANS = dm-tool.1 \
 
 EXTRA_DIST = apparmor/lightdm-guest-session.in $(polkit_in_files)
 CLEANFILES = lightdm-guest-session $(polkit_DATA)
+
+x11dir = $(sysconfdir)/X11
+dist_x11_SCRIPTS = Xgreeter.lightdm
diff --git a/data/Xgreeter.lightdm b/data/Xgreeter.lightdm
new file mode 100755
index 00000000..286e78fc
--- /dev/null
+++ b/data/Xgreeter.lightdm
@@ -0,0 +1,4 @@
+#!/bin/sh -efu
+FIXKEYBOARD=/etc/X11/xinit/fixkeyboard
+[ ! -e "$FIXKEYBOARD" ] || "$FIXKEYBOARD"
+exec "$@"
diff --git a/data/lightdm.conf b/data/lightdm.conf
index 915067e9..9523576e 100644
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -109,7 +109,7 @@ xserver-command=/etc/X11/xinit/xserverrc
 #allow-guest=true
 #guest-session=
 session-wrapper=/etc/X11/Xsession
-#greeter-wrapper=
+greeter-wrapper=/etc/X11/Xgreeter.lightdm
 #guest-wrapper=
 #display-setup-script=
 #display-stopped-script=