diff --git a/gdm-2.18.4-tcp-wrappers.patch b/gdm-2.18.4-tcp-wrappers.patch
new file mode 100644
index 0000000..c888e1c
--- /dev/null
+++ b/gdm-2.18.4-tcp-wrappers.patch
@@ -0,0 +1,26 @@
+We just fill LIBWRAP_PATH with junk so it passes the rest of the tests
+
+diff -up gdm-2.18.4/configure.ac.tcp-wrappers gdm-2.18.4/configure.ac
+--- gdm-2.18.4/configure.ac.tcp-wrappers	2007-11-06 17:45:44.000000000 -0500
++++ gdm-2.18.4/configure.ac	2007-11-06 17:45:51.000000000 -0500
+@@ -546,7 +546,7 @@ if test x$with_tcp_wrappers = xno ; then
+ 	echo "TCP wrappers disabled"
+ else
+   AC_MSG_CHECKING([whether to use TCP wrappers])
+-  LIBWRAP_PATH=""
++  LIBWRAP_PATH="-lwrap"
+   case "$host" in
+     *-*-solaris*)
+ 	if test -f /usr/sfw/lib/libwrap.so; then
+diff -up gdm-2.18.4/configure.tcp-wrappers gdm-2.18.4/configure
+--- gdm-2.18.4/configure.tcp-wrappers	2007-07-30 16:10:54.000000000 -0400
++++ gdm-2.18.4/configure	2007-11-06 17:45:13.000000000 -0500
+@@ -29409,7 +29409,7 @@ if test x$with_tcp_wrappers = xno ; then
+ else
+   { echo "$as_me:$LINENO: checking whether to use TCP wrappers" >&5
+ echo $ECHO_N "checking whether to use TCP wrappers... $ECHO_C" >&6; }
+-  LIBWRAP_PATH=""
++  LIBWRAP_PATH="-lwrap"
+   case "$host" in
+     *-*-solaris*)
+ 	if test -f /usr/sfw/lib/libwrap.so; then
diff --git a/gdm.spec b/gdm.spec
index 487aa85..d32ad95 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -64,6 +64,8 @@ Patch42: gdm-2.20.0-allow-escape.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=246399
 Patch43: gdm-2.20.1-keymouselistener-segfault.patch
 
+patch44: gdm-2.18.4-tcp-wrappers.patch
+
 Patch100: gdm-2.20.1-change-defaults.patch
 Patch101: stupid-bullets.patch
 
@@ -118,6 +120,7 @@ BuildRequires: xorg-x11-server-Xorg
 BuildRequires: nss-devel >= %{nss_version}
 BuildRequires: ConsoleKit
 BuildRequires: libselinux-devel
+BuildRequires: tcp_wrappers-devel
 
 Requires: audit-libs >= %{libauditver}
 
@@ -152,6 +155,7 @@ Extra icons / faces for the GNOME Display Manager.
 %patch41 -p1 -b .pixbuf-ref
 %patch42 -p1 -b .allow-escape
 %patch43 -p1 -b .keymouselistener-segfault
+%patch44 -p1 -b .tcp-wrappers
 
 %patch100 -p1 -b .change-defaults
 %patch101 -p1 -b .stupid-bullets
@@ -365,6 +369,9 @@ fi
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Nov  6 2007 Ray Strode <rstrode@redhat.com> - 1:2.20.1-6
+- link tcp wrappers in (bug 363021), CVE-2007-5079
+
 * Fri Oct  26 2007 Ray Strode <rstrode@redhat.com> - 1:2.20.1-5
 - fix gdmflexiserver -n (bug 352491)