diff --git a/.cvsignore b/.cvsignore
index 814d4ce..9c558f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lftp-2.6.5.tar.gz
+lftp-2.6.9.tar.gz
diff --git a/lftp.spec b/lftp.spec
index 051a368..04ff26d 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,11 +1,13 @@
 Summary: A sophisticated file transfer program
 Name: lftp 
-Version: 2.6.5
-Release: 4
+Version: 2.6.9
+Release: 1
 License: GPL
 Group: Applications/Internet
-Source: http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/lftp-%{version}.tar.gz
+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
 URL: http://lftp.yar.ru/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel
@@ -17,7 +19,11 @@ mirroring, and can transfer several files in parallel. It is designed with
 reliability in mind.
 
 %prep
-%setup -q  
+%setup -q
+%patch0 -p1 -b .ulf
+pushd src
+%patch1 -p0 -b .solar-warnings
+popd
 
 %build
 if pkg-config openssl ; then
@@ -27,12 +33,12 @@ fi
 LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS
 %configure --with-modules --disable-static --with-ssl
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make LIBTOOL=%{_bindir}/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
-%makeinstall  LIBTOOL=/usr/bin/libtool
+%makeinstall LIBTOOL=%{_bindir}/libtool
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/*
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so
@@ -63,6 +69,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lftp/%{version}/proto-http.so
 
 %changelog
+* 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)
+- include patch based on patch from Ulf Härnhammar to fix compile warnings
+  modified based on input from Solar Designer
+
+* Mon Dec  8 2003 Nalin Dahyabhai <nalin@redhat.com>
+- update to 2.6.9
+
 * Wed Aug  6 2003 Elliot Lee <sopwith@redhat.com>
 - Fix libtool
 
diff --git a/sources b/sources
index a3707ec..002bf37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04169583d7ff5820370b45544ea6c922  lftp-2.6.5.tar.gz
+1aded77cedac98ca44541a0ade246229  lftp-2.6.9.tar.gz