diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
index 203c30ae13e..3257de75aeb 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/11keymap
@@ -35,9 +35,9 @@ if [ "${set_keymap}" ]; then
 		"${rootmnt}/etc/conf.d/keymaps"
 fi
 
-if [ -f "${rootmnt}/etc/hal/fdi/policy/10-keymap.fdi" ]; then
-	sed -i -e "s|>us<|>${keymap}<|" \
-		${rootmnt}/etc/hal/fdi/policy/10-keymap.fdi
+# Setup keymap for lightdm.
+if [ -r "${rootmnt}/etc/lightdm.conf" ]; then
+	sed -i -e "s|^\#\(layout=\).*|\1${keymap}|" ${rootmnt}/etc/lightdm.conf
 fi
 
 log_end_msg
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
index 6002f35ce1e..5824fb085ca 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/14locales
@@ -34,4 +34,10 @@ if [ "${set_locale}" ]; then
 	echo "system_locale=\"$locale\"" > ${rootmnt}/etc/conf.d/locale
 fi
 
+# Setup language in lightdm.
+if [ -r "${rootmnt}/etc/lightdm.conf" ]; then
+	sed -i -e "s|^\#\(language=\).*|\1${locale}.utf8|" \
+		${rootmnt}/etc/lightdm.conf
+fi
+
 log_end_msg
diff --git a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
index 24775145b8e..d5cf480f7ec 100755
--- a/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
+++ b/srcpkgs/xbps-casper/files/scripts/casper-bottom/15autologin
@@ -25,8 +25,8 @@ if [ -f "${rootmnt}/etc/inittab" ]; then
 	sed -i -e "s|agetty|casper-getty|g" "${rootmnt}/etc/inittab"
 fi
 
+# Configure GDM autologin
 if [ -d /root/etc/gdm ]; then
-    # Configure GDM autologin
     GDMCustomFile=/root/etc/gdm/custom.conf
     AutologinParameters="AutomaticLoginEnable=true\n\
 AutomaticLogin=$USERNAME\n\
@@ -42,5 +42,16 @@ TimedLoginDelay=10"
         sed -i "s/\[daemon\]/\[daemon\]\n$AutologinParameters/" $GDMCustomFile
     fi
 fi
+# Configure lightdm autologin. Autologin doesn't seem to work
+# with lightdm-0.2.3, will be enabled when it's fixed.
+log_end_msg
+exit 0
+
+if [ -r /root/etc/lightdm.conf ]; then
+	sed -i -e "s|^\#\(default-user=\).*|\1$USERNAME|" \
+		/root/etc/lightdm.conf
+	sed -i -e "s|^\#\(default-user-timeout=\).*|\10|" \
+		/root/etc/lightdm.conf
+fi
 
 log_end_msg
diff --git a/srcpkgs/xbps-casper/template b/srcpkgs/xbps-casper/template
index 58f2930b81d..56f5ae2fcdf 100644
--- a/srcpkgs/xbps-casper/template
+++ b/srcpkgs/xbps-casper/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-casper'
 pkgname=xbps-casper
-_localver=0.7	# XBPS package version
+_localver=0.8	# XBPS package version
 _distver=1.236	# This should match the upstream (Ubuntu) version
 version=${_localver}.${_distver}
 build_style=custom-install