diff --git a/.cvsignore b/.cvsignore
index 9c558f8..d750785 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lftp-2.6.9.tar.gz
+lftp-2.6.10.tar.bz2
diff --git a/lftp.spec b/lftp.spec
index 04ff26d..dffcb06 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,13 +1,11 @@
 Summary: A sophisticated file transfer program
 Name: lftp 
-Version: 2.6.9
+Version: 2.6.10
 Release: 1
 License: GPL
 Group: Applications/Internet
-Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.gz
-Source1: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.gz.asc
-Patch0: lftp-2.6.9-ulf.patch
-Patch1: lftp-2.6.9-solar-warnings.patch
+Source0: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2
+Source1: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.bz2.asc
 URL: http://lftp.yar.ru/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel
@@ -20,10 +18,6 @@ reliability in mind.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ulf
-pushd src
-%patch1 -p0 -b .solar-warnings
-popd
 
 %build
 if pkg-config openssl ; then
@@ -31,7 +25,7 @@ if pkg-config openssl ; then
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS
-%configure --with-modules --disable-static --with-ssl
+%configure --with-modules --disable-static --with-ssl --with-debug
 export tagname=CC
 make LIBTOOL=%{_bindir}/libtool
 
@@ -69,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lftp/%{version}/proto-http.so
 
 %changelog
+* Fri Dec 12 2003 Nalin Dahyabhai <nalin@redhat.com> 2.6.10-1
+- update to 2.6.10, which folds in the previous patches
+- configure with --with-debug so that we get useful debug info
+
 * Tue Dec  9 2003 Nalin Dahyabhai <nalin@redhat.com> 2.6.9-1
 - include patch based on patch from Ulf Härnhammar to fix unsafe use of
   sscanf when reading http directory listings (CAN-2003-0963)
diff --git a/sources b/sources
index 002bf37..a81e09f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1aded77cedac98ca44541a0ade246229  lftp-2.6.9.tar.gz
+851387ab94bad8013d20ba7d3758b603  lftp-2.6.10.tar.bz2