diff --git a/0001-Make-sure-to-disable-g-s-d-plugins-in-greeter.patch b/0001-Make-sure-to-disable-g-s-d-plugins-in-greeter.patch
new file mode 100644
index 0000000..704442d
--- /dev/null
+++ b/0001-Make-sure-to-disable-g-s-d-plugins-in-greeter.patch
@@ -0,0 +1,26 @@
+From 408d82df9e264e37d0dec7f049b2a64ea22032ab Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 7 Feb 2011 16:24:27 +0000
+Subject: [PATCH] Make sure to disable g-s-d plugins in greeter
+
+By grepping for the right plugins.
+---
+ data/make-dconf-override-db.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
+index 6fd7cbd..07de694 100755
+--- a/data/make-dconf-override-db.sh
++++ b/data/make-dconf-override-db.sh
+@@ -38,7 +38,7 @@ gsettings set org.gnome.settings-daemon.plugins.media-keys search '""'
+ gsettings set org.gnome.settings-daemon.plugins.media-keys stop '""'
+ gsettings set org.gnome.settings-daemon.plugins.media-keys www '""'
+ 
+-gsettings list-schemas | egrep '^org\.gnome\.gnome-settings-daemon\.plugins\.' | while read schema; do
++gsettings list-schemas | egrep '^org\.gnome\.settings-daemon\.plugins\.' | while read schema; do
+     gsettings set $schema active false
+ done
+ 
+-- 
+1.7.4
+
diff --git a/gdm.spec b/gdm.spec
index 45bba99..9ae3938 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.91.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -89,6 +89,7 @@ Provides: service(graphical-login) = %{name}
 
 Requires: audit-libs >= %{libauditver}
 
+Patch1: 0001-Make-sure-to-disable-g-s-d-plugins-in-greeter.patch
 Patch2: plymouth.patch
 Patch3: fix-theme-related-crash.patch
 
@@ -120,6 +121,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 
 %prep
 %setup -q
+%patch1 -p1 -b .gsd-plugins
 %patch2 -p1 -b .plymouth
 %patch3 -p1 -b .fix-theme-related-crash
 %patch96 -p1 -b .multistack
@@ -361,6 +363,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || :
 %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
 
 %changelog
+* Mon Feb 07 2011 Bastien Nocera <bnocera@redhat.com> 2.91.6-3
+- Really disable gnome-settings-daemon plugins in the greeter
+
 * Fri Feb 04 2011 Ray Strode <rstrode@redhat.com> 2.91.6-2
 - Drop some unimportant patches
 - Attempt to fix bug 674978 (theme related crash)