diff --git a/gdm-2.21.10-fix-gaping-security-hole.patch b/gdm-2.21.10-fix-gaping-security-hole.patch
deleted file mode 100644
index 3b98bdf..0000000
--- a/gdm-2.21.10-fix-gaping-security-hole.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- gdm-2.21.10/daemon/gdm-session-worker.c	(revision 6145)
-+++ gdm-2.21.10/daemon/gdm-session-worker.c	(working copy)
-@@ -111,6 +111,7 @@ struct GdmSessionWorkerPrivate
-         char             *display_device;
-         char             *hostname;
-         char             *username;
-+        uid_t             uid;
-         gboolean          password_is_required;
- 
-         int               cred_flags;
-@@ -1176,6 +1177,7 @@ _change_user (GdmSessionWorker  *worker,
-                 return FALSE;
-         }
- #endif
-+        worker->priv->uid = uid;
- 
-         if (setgid (gid) < 0) {
-                 return FALSE;
-@@ -1574,7 +1576,7 @@ gdm_session_worker_start_user_session (G
-                 char  *home_dir;
-                 int    fd;
- 
--                if (setuid (getuid ()) < 0) {
-+                if (setuid (worker->priv->uid) < 0) {
-                         g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
-                         _exit (1);
-                 }
diff --git a/gdm.spec b/gdm.spec
index 0b0fd28..69f0a67 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.21.10
-Release: 0.2008.04.11.4%{?dist}
+Release: 0.2008.04.16.1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -77,7 +77,6 @@ BuildRequires: gnome-panel-devel
 Requires: audit-libs >= %{libauditver}
 Patch0: ck-multi.patch
 Patch1: xkb-groups.patch
-Patch2: gdm-2.21.10-fix-gaping-security-hole.patch
 Patch98: gdm-2.21.10-disable-debug-messages.patch
 Patch99: gdm-2.21.8-fedora-logo.patch
 
@@ -100,7 +99,6 @@ multiple simulanteous logged in users.
 %setup -q
 %patch0 -p1 -b .ck-multi
 %patch1 -p1 -b .xkb-groups
-%patch2 -p1 -b .fix-gaping-security-hole
 %patch98 -p1 -b .disable-debug-messages
 %patch99 -p1 -b .fedora-logo
 
@@ -299,6 +297,10 @@ fi
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Wed Apr 16 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.10-0.2008.04.16.1
+- Disable typeahead when asking for password so password can't get shown
+  in clear text
+
 * Wed Apr 16 2008 Ray Strode <rstrode@redhat.com> - 1:2.21.10-0.2008.04.11.4
 - Use start-here instead of fedora-logo-icon to aid generic-logos
 
diff --git a/sources b/sources
index 2994e40..573aec8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91fd630ed1162aa1ded537fc5a59ab74  gdm-2.21.10.tar.gz
+849633c4032a629fed95d6921a661a94  gdm-2.21.10.tar.gz