diff --git a/curl-7.17.1-badsocket.patch b/curl-7.17.1-badsocket.patch
new file mode 100644
index 0000000..7f092ae
--- /dev/null
+++ b/curl-7.17.1-badsocket.patch
@@ -0,0 +1,13 @@
+diff -up curl-7.17.1/lib/ftp.c.badsocket curl-7.17.1/lib/ftp.c
+--- curl-7.17.1/lib/ftp.c.badsocket	2007-10-27 00:25:19.000000000 +0200
++++ curl-7.17.1/lib/ftp.c	2008-01-08 15:09:03.000000000 +0100
+@@ -3228,7 +3228,8 @@ static CURLcode Curl_ftp_done(struct con
+     /* Note that we keep "use" set to TRUE since that (next) connection is
+        still requested to use SSL */
+   }
+-  sclose(conn->sock[SECONDARYSOCKET]);
++  if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET])
++    sclose(conn->sock[SECONDARYSOCKET]);
+ 
+   conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
+ 
diff --git a/curl.spec b/curl.spec
index f649b40..8d0c0ff 100644
--- a/curl.spec
+++ b/curl.spec
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.17.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@ Patch1: curl-7.15.3-multilib.patch
 Patch2: curl-7.16.0-privlibs.patch
 Patch3: curl-7.16.4-curl-config.patch
 Patch4: curl-7.17.1-sslgen.patch
+Patch5: curl-7.17.1-badsocket.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,11 +20,12 @@ BuildRequires: libtool, pkgconfig, libidn-devel, zlib-devel
 BuildRequires: nss-devel >= 3.11.7-7
 
 %description
-cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
-Dict servers, using any of the supported protocols. cURL is designed
-to work without user interaction or any kind of interactivity. cURL
-offers many useful capabilities, like proxy support, user
-authentication, FTP upload, HTTP post, and file transfer resume.
+cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS,
+DICT, TELNET and TFTP servers, using any of the supported protocols.
+cURL is designed to work without user interaction or any kind of
+interactivity. cURL 5;3~offers many useful capabilities, like proxy 
+support, user authentication, FTP upload, HTTP post, and file transfer
+resume.
 
 %package devel
 Group: Development/Libraries
@@ -43,6 +45,7 @@ use cURL's capabilities internally.
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .curl-config
 %patch4 -p1 -b .sslgen
+%patch5 -p1 -b .badsocket
 
 %build
 if pkg-config nss ; then
@@ -54,6 +57,7 @@ fi
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--with-ldap-lib=libldap-%{ldap_version}.so.0 \
 	--with-lber-lib=liblber-%{ldap_version}.so.0 \
+	--enable-ldaps \
 	--disable-static
 sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
 	Makefile libcurl.pc
@@ -103,7 +107,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
-* Sun Nov 18 2007 Jindrich Novy <jnovy@redhat.com> 7.17.1
+* Tue Jan 22 2008 Jindrich Novy <jnovy@redhat.com> 7.17.1-2
+- do not attempt to close a bad socket (#427966),
+  thanks to Caolan McNamara
+- enable LDAPS support (#225671)
+- update description to contain complete supported servers list (#393861)
+
+* Sun Nov 18 2007 Jindrich Novy <jnovy@redhat.com> 7.17.1-1
 - update to curl 7.17.1
 - include patch to enable SSL usage in NSS when a socket is opened
   nonblocking, thanks to Rob Crittenden (rcritten@redhat.com) (#387991)