diff --git a/.gitignore b/.gitignore
index ebb8de0..cfd3712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lightdm-1.3.3.tar.gz
+/lightdm-1.4.0.tar.gz
diff --git a/lightdm-1.3.1-fedora_config.patch b/lightdm-1.3.1-fedora_config.patch
deleted file mode 100644
index 911daee..0000000
--- a/lightdm-1.3.1-fedora_config.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up lightdm-1.3.1/data/lightdm.conf.fedora_config lightdm-1.3.1/data/lightdm.conf
---- lightdm-1.3.1/data/lightdm.conf.fedora_config	2012-05-28 18:27:22.000000000 -0500
-+++ lightdm-1.3.1/data/lightdm.conf	2012-07-01 10:14:02.550230009 -0500
-@@ -18,9 +18,9 @@
- #start-default-seat=true
- #greeter-user=lightdm
- #minimum-display-number=0
--#minimum-vt=7
-+minimum-vt=1
- #lock-memory=true
--#user-authority-in-system-dir=false
-+user-authority-in-system-dir=true
- #guest-account-script=guest-account
- #log-directory=/var/log/lightdm
- #run-directory=/var/run/lightdm
-@@ -64,14 +64,14 @@
- #xdmcp-manager=
- #xdmcp-port=177
- #xdmcp-key=
--#greeter-session=example-gtk-gnome
-+greeter-session=lightdm-greeter
- #greeter-hide-users=false
- #greeter-allow-guest=true
- #greeter-show-manual-login=false
- #user-session=default
- #allow-guest=true
- #guest-session=UNIMPLEMENTED
--#session-wrapper=lightdm-session
-+session-wrapper=/etc/X11/xinit/Xsession
- #display-setup-script=
- #greeter-setup-script=
- #session-setup-script=
-diff -up lightdm-1.3.1/data/users.conf.fedora_config lightdm-1.3.1/data/users.conf
---- lightdm-1.3.1/data/users.conf.fedora_config	2011-12-08 19:51:23.000000000 -0600
-+++ lightdm-1.3.1/data/users.conf	2012-07-01 10:13:28.092660756 -0500
-@@ -9,6 +9,6 @@
- # hidden-shells = Shells that indicate a user cannot login
- #
- [UserAccounts]
--minimum-uid=500
--hidden-users=nobody nobody4 noaccess
--hidden-shells=/bin/false /usr/sbin/nologin
-+minimum-uid=1000
-+hidden-users=nfsnobody nobody nobody4 noaccess
-+hidden-shells=/bin/false /sbin/nologin
diff --git a/lightdm-1.4.0-fedora_config.patch b/lightdm-1.4.0-fedora_config.patch
new file mode 100644
index 0000000..3983c17
--- /dev/null
+++ b/lightdm-1.4.0-fedora_config.patch
@@ -0,0 +1,32 @@
+--- data/lightdm.conf.orig	2012-10-05 09:43:48.307845764 +0200
++++ data/lightdm.conf	2012-10-05 09:44:57.956957476 +0200
+@@ -19,9 +19,9 @@
+ #start-default-seat=true
+ #greeter-user=lightdm
+ #minimum-display-number=0
+-#minimum-vt=7
++minimum-vt=1
+ #lock-memory=true
+-#user-authority-in-system-dir=false
++user-authority-in-system-dir=true
+ #guest-account-script=guest-account
+ #log-directory=/var/log/lightdm
+ #run-directory=/var/run/lightdm
+@@ -69,7 +69,7 @@
+ #xdmcp-manager=
+ #xdmcp-port=177
+ #xdmcp-key=
+-#greeter-session=example-gtk-gnome
++greeter-session=lightdm-greeter
+ #greeter-hide-users=false
+ #greeter-allow-guest=true
+ #greeter-show-manual-login=false
+@@ -77,7 +77,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/X11/xinit/Xsession
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
diff --git a/lightdm.spec b/lightdm.spec
index f2de6af..b59038f 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -6,8 +6,8 @@
 
 Name:    lightdm
 Summary: Lightweight Display Manager
-Version: 1.3.3
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 1%{?dist}
 
 # library/bindings are LGPLv3, the rest GPLv3+
 License: LGPLv3+ and GPLv3+
@@ -22,7 +22,7 @@ Source5: lightdm.preset
 
 Patch0: lightdm-lock-screen-before-switch.patch
 ## Downstream patches:
-Patch10: lightdm-1.3.1-fedora_config.patch
+Patch10: lightdm-1.4.0-fedora_config.patch
 # hack in support for --nodaemon option
 Patch11: lightdm-1.2.2-nodaemon_option.patch
 
@@ -120,7 +120,7 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
 %setup -q
 
 %patch0 -p1 -b .lock-screen
-%patch10 -p1 -b .fedora_config
+%patch10 -b .fedora_config
 %patch11 -p1 -b .nodaemon_option
 
 # rpath hack
@@ -243,6 +243,9 @@ exit 0
 
 
 %changelog
+* Fri Oct 05 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 1.4.0-1
+- lightdm-1.4.0
+
 * Tue Sep 04 2012 Rex Dieter <rdieter@fedoraproject.org> 1.3.3-2
 - lightdm.service: After=+livesys-late.service (#853985)
 
diff --git a/sources b/sources
index 35184dc..8545e8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bea9fc58a1798bcf76808225e0bf4f22  lightdm-1.3.3.tar.gz
+622d9087ec773dd0626a250a5868f88c  lightdm-1.4.0.tar.gz