diff --git a/srcpkgs/lightdm/files/lightdm.pam b/srcpkgs/lightdm/files/lightdm.pam
new file mode 100644
index 00000000000..655299cb7cc
--- /dev/null
+++ b/srcpkgs/lightdm/files/lightdm.pam
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth            requisite       pam_nologin.so
+auth            required        pam_env.so
+auth            required        pam_unix.so
+auth            optional        pam_gnome_keyring.so
+account         required        pam_unix.so
+session         required        pam_limits.so
+session         required        pam_unix.so
+session         optional        pam_gnome_keyring.so auto_start
+password        required        pam_unix.so
diff --git a/srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch b/srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch
new file mode 100644
index 00000000000..2d9beb18347
--- /dev/null
+++ b/srcpkgs/lightdm/patches/themes_gnome_gtkrc.patch
@@ -0,0 +1,13 @@
+--- themes/gnome/gtkrc.orig	2011-02-16 15:30:48.425744100 +0100
++++ themes/gnome/gtkrc	2011-02-16 15:32:41.960886724 +0100
+@@ -1,7 +1,7 @@
+-gtk_theme_name = "HumanLogin"
+-gtk_icon_theme_name = "LoginIcons"
++gtk_theme_name = "Clearlooks"
++gtk_icon_theme_name = "gnome"
+ gtk_cursor_theme_name = "DMZ-White"
+-gtk_font_name = "UbuntuBeta 10"
++gtk_font_name = "Arial 10"
+ # Not working, but set to 96*1024 (=96dpi)
+ gtk_xft_dpi = 98304
+ gtk_xft_hinting = 1
diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template
index dff2b40a922..48c500d0737 100644
--- a/srcpkgs/lightdm/template
+++ b/srcpkgs/lightdm/template
@@ -1,6 +1,7 @@
 # Template file for 'lightdm'
 pkgname=lightdm
 version=0.2.3
+revision=1
 distfiles="http://launchpad.net/lightdm/trunk/$version/+download/lightdm-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--localstatedir=/var"
@@ -48,11 +49,16 @@ Add_dependency build libxcb-devel
 Add_dependency build libXdmcp-devel
 Add_dependency build pam-devel
 
+Add_dependency full gnome-icon-theme
 Add_dependency full dbus
 
 post_install()
 {
-	# Remove provided startup files, use our own.
+	# Remove provided init file use our own.
 	rm -rf ${DESTDIR}/etc/init
 	install -D -m755 ${FILESDIR}/lightdm.rc ${DESTDIR}/etc/init.d/lightdm
+	install -D -m644 ${FILESDIR}/lightdm.pam ${DESTDIR}/etc/pam.d/lightdm
+
+	# Minimum UID shall be 1000 for ordinary users.
+	sed -i -e "s|^\#\(minimum-uid=\).*|\11000|" ${DESTDIR}/etc/lightdm.conf
 }