diff --git a/gdm-autologin-session-logout.patch b/gdm-autologin-session-logout.patch
new file mode 100644
index 0000000..e4ecd8e
--- /dev/null
+++ b/gdm-autologin-session-logout.patch
@@ -0,0 +1,33 @@
+From 47c73024739a65614c6a0ddcdd1c08239798044a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 04 Oct 2012 21:36:57 +0000
+Subject: slave: only set up autologin conversations
+
+Right now any time any session conversation is started,
+we run its setup call if autologin is enabled. We should only do this
+for autologin sessions, otherwise, we may repeat work done by
+the greeter.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=682467
+---
+diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
+index 9bc8522..4bbf503 100644
+--- a/daemon/gdm-simple-slave.c
++++ b/daemon/gdm-simple-slave.c
+@@ -485,8 +485,12 @@ on_session_conversation_started (GdmSession       *session,
+         char    *username;
+         int      delay;
+ 
++        g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name);
++
++        if (g_strcmp0 (service_name, "gdm-autologin") != 0) {
++                return;
++        }
+ 
+-        g_debug ("GdmSimpleSlave: session conversation started");
+         enabled = FALSE;
+         gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay);
+         if (! enabled) {
+--
+cgit v0.9.0.2
+
diff --git a/gdm.changes b/gdm.changes
index 7d73124..dc23f29 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jan 20 09:53:24 UTC 2013 - dimstar@opensuse.org
+
+- Add gdm-autologin-session-logout.patch: Fix login after logging
+  out from a auto-login session (bgo#682467)
+
 -------------------------------------------------------------------
 Fri Jan 18 22:59:34 UTC 2013 - rbrownccb@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index ba5a730..447414a 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -64,6 +64,8 @@ Patch34:        gdm-default-wm.patch
 Patch35:        gdm-xauthlocalhostname.patch
 # PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
 Patch40:        gdm-look-at-runlevel.patch
+# PATCH-FIX-UPSTREAM gdm-autologin-session-logout.patch bgo#682467 dimstar@opensuse.org -- Fix login after logging out from a auto-login session
+Patch41:        gdm-autologin-session-logout.patch
 BuildRequires:  check-devel
 # needed for directory ownership
 BuildRequires:  dconf
@@ -234,6 +236,7 @@ translation-update-upstream
 %patch34 -p1
 %patch35 -p1
 %patch40 -p1
+%patch41 -p1
 
 %build
 NOCONFIGURE=1 gnome-autogen.sh