diff --git a/gdm-2.20.1-keymouselistener-segfault.patch b/gdm-2.20.1-keymouselistener-segfault.patch
new file mode 100644
index 0000000..1bee085
--- /dev/null
+++ b/gdm-2.20.1-keymouselistener-segfault.patch
@@ -0,0 +1,12 @@
+diff -urN gdm-2.20.1.orig/gui/modules/keymouselistener.c gdm-2.20.1/gui/modules/keymouselistener.c
+--- gdm-2.20.1.orig/gui/modules/keymouselistener.c	2007-10-17 17:18:31.000000000 -0400
++++ gdm-2.20.1/gui/modules/keymouselistener.c	2007-10-17 18:29:44.000000000 -0400
+@@ -158,7 +158,7 @@
+ {
+ #ifdef HAVE_XINPUT
+ 	XEventClass  event_list[40];
+-	int          i, j, number = 0, num_devices; 
++	int          i, j, number = 0, num_devices = 0; 
+ 	XDeviceInfo  *devices = NULL;
+ 	XDevice      *device = NULL;
+ 
diff --git a/gdm.spec b/gdm.spec
index c28b970..d4f4bc7 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -63,6 +63,7 @@ Patch42: gdm-2.20.0-allow-escape.patch
 
 Patch100: gdm-2.20.0-change-defaults.patch
 Patch101: stupid-bullets.patch
+Patch102: gdm-2.20.1-keymouselistener-segfault.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -151,6 +152,7 @@ Extra icons / faces for the GNOME Display Manager.
 
 %patch100 -p1 -b .change-defaults
 %patch101 -p1 -b .stupid-bullets
+%patch102 -p1 -b .keymouselistener-segfault
 
 %build
 cp -f %{SOURCE1} config/gdm
@@ -361,6 +363,10 @@ fi
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Wed Oct  17 2007 Warren Togami <wtogami@redhat.com> - 1:2.20.1-3
+- Fix GDM segfault when XInput extension not available
+  Also fixes XDMCP (#246399)
+
 * Wed Oct  17 2007 Dan Walsh <dwalsh@redhat.com> - 1:2.20.1-1
 - Change pam config so keyinit happens after pam_selinux open