diff --git a/.cvsignore b/.cvsignore
index 1d016bc..90e380d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fetchmail-6.2.5.tar.gz
-fetchmail-patch-6.2.5.2.gz
+fetchmail-6.2.9-rc10.tar.bz2
+fetchmail-6.2.9-rc10.tar.bz2.asc
diff --git a/fetchmail.spec b/fetchmail.spec
index 111edd6..3d569d2 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,30 +1,21 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define fetchmailconf 0
 
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
-Version: 6.2.5.2
-Release: 2
+Version: 6.2.9
+Release: 0.1.rc10
 Requires: smtpdaemon
-Source0: http://download.berlios.de/fetchmail/fetchmail-6.2.5.tar.gz
-Source1: http://www.catb.org/~esr/fetchmail/fetchmail-6.2.5.tar.gz.asc
-Source2: http://download.berlios.de/fetchmail/fetchmail-patch-6.2.5.2.gz
-Source3: http://download.berlios.de/fetchmail/fetchmail-patch-6.2.5.2.gz.asc
-Source4: fetchmailconf.1
-Patch0: fetchmail-6.2.0-krb5-config.patch
-Patch1: fetchmail-6.2.0-gsspop.patch
-Patch2: fetchmail-6.2.0-crlf.patch
-Patch3: fetchmail-6.2.5-popcapa.patch
-Patch4: fetchmail-6.2.5-addrconf.patch
-Patch5: fetchmail-6.2.5-recent-after-expunge.patch
-Patch6: fetchmail-6.2.5-krb5.patch
-Patch7: fetchmail-6.2.5-port.patch
+Source0: http://download.berlios.de/fetchmail/fetchmail-6.2.9-rc10.tar.bz2
+Source1: http://download.berlios.de/fetchmail/fetchmail-6.2.9-rc10.tar.bz2.asc
+Patch0: fetchmail-6.2.5-addrconf.patch
 URL: http://fetchmail.berlios.de/
 License: GPL
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: openssl-devel gettext-devel
-%{!?nohesiod:BuildPrereq: hesiod-devel}
-%{!?nokerberos:BuildPrereq: krb5-devel}
+BuildRequires: openssl-devel gettext-devel
+%{!?nohesiod:BuildRequires: hesiod-devel}
+%{!?nokerberos:BuildRequires: krb5-devel}
 %if ! %{fetchmailconf}
 Obsoletes: fetchmailconf
 %endif
@@ -55,37 +46,26 @@ Install fetchmailconf if you need help configuring fetchmail. You'll
 need to have Python and Tk installed in order to use fetchmailconf.
 
 %prep
-%setup -q -n fetchmail-6.2.5
-zcat %SOURCE2 | patch -p1
-%patch0 -p1 -b .krb5-config
-%patch1 -p1 -b .gsspop
-%patch2 -p1 -b .crlf
-%patch3 -p1 -b .popauth
-%patch4 -p1 -b .addrconf
-%patch5 -p1 -b .recent-after-expunge
-%patch6 -p1 -b .krb5
-%patch7 -p1 -b .port
-
-autoheader
-autoconf
+%setup -q -n fetchmail-6.2.9-rc10
+%patch0 -p1 -b .addrconf
 
 %build
-%configure --enable-POP3 --enable-IMAP --with-ssl=auto \
-	%{!?nohesiod:--with-hesiod=auto} \
+%configure --enable-POP3 --enable-IMAP --with-ssl \
+	%{!?nohesiod:--with-hesiod} \
 	--enable-ETRN --enable-NTLM --enable-SDPS --enable-RPA \
-	--enable-nls --enable-inet6 \
+	--enable-nls \
 %{?nokerberos:--without-kerberos --without-kerberos5 --without-kerberos --without-gssapi} \
 %{!?nokerberos:--with-kerberos --with-kerberos5 --with-kerberos --with-gssapi}
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}/man1
-install -m644 $RPM_SOURCE_DIR/fetchmailconf.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %if ! %{fetchmailconf}
 rm -f $RPM_BUILD_ROOT%{_bindir}/fetchmailconf*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1*
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/fetchmailconf.py*
 %endif
 
 %find_lang %name
@@ -95,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING FAQ FEATURES INSTALL README README.SSL NEWS NOTES TODO
+%doc BUGS COPYING FAQ FEATURES NEWS NOTES README README.SSL TODO
 %{_bindir}/fetchmail
 %{_mandir}/man1/fetchmail.1*
 
@@ -103,10 +83,14 @@ rm -rf $RPM_BUILD_ROOT
 %files -n fetchmailconf
 %defattr(-,root,root)
 %{_bindir}/fetchmailconf
+%{python_sitelib}/fetchmailconf.py*
 %{_mandir}/man1/fetchmailconf.1*
 %endif
 
 %changelog
+* Wed Nov 30 2005 Miloslav Trmac <mitr@redhat.com> - 6.2.9-0.1.rc10
+- Update to fetchmail-6.2.9-rc10
+
 * Wed Nov  9 2005 Miloslav Trmac <mitr@redhat.com> - 6.2.5.2-2
 - Rebuild with new openssl
 - Ship README.SSL, drop html documentation copies
diff --git a/sources b/sources
index 78c93c6..84eaa0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9956b30139edaa4f5f77c4d0dbd80225  fetchmail-6.2.5.tar.gz
-be18f89b94e937a22560aa452e524c4b  fetchmail-patch-6.2.5.2.gz
+92ee5104bd0709e361b97b3a33183176  fetchmail-6.2.9-rc10.tar.bz2
+5ff62f1f443450da428ff3f0fab0d695  fetchmail-6.2.9-rc10.tar.bz2.asc