diff --git a/fetchmail.spec b/fetchmail.spec
index 352af2a..fbff57f 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -3,19 +3,20 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.2.0
-Release: 3.9
+Release: 8
 Requires: smtpdaemon
-Source0: http://www.tuxedo.org/~esr/fetchmail/fetchmail-%{version}.tar.gz
-Source1: http://www.tuxedo.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
+Source0: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz
+Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
 Source2: fetchmailconf.1
 Patch0: fetchmail-6.2.0-krb5-config.patch
 Patch1: fetchmail-6.2.0-markus.patch
 Patch2: fetchmail-6.2.0-reply_hack.patch
-URL: http://www.tuxedo.org/~esr/fetchmail/
+URL: http://www.catb.org/~esr/fetchmail/
 License: GPL
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: hesiod-devel, openssl-devel
+BuildPrereq: openssl-devel
+%{!?nohesiod:BuildPrereq: hesiod-devel}
 %{!?nokerberos:BuildPrereq: krb5-devel}
 %if ! %{fetchmailconf}
 Obsoletes: fetchmailconf
@@ -54,12 +55,12 @@ need to have Python and Tk installed in order to use fetchmailconf.
 autoconf
 
 %build
-LDFLAGS="-L%{_libdir} -L/usr/kerberos/%{_lib}"; export LDFLAGS
 LIBS=-ldl; export LIBS
-%configure --enable-POP3 --enable-IMAP --with-ssl=auto --with-hesiod=auto \
+%configure --enable-POP3 --enable-IMAP --with-ssl=auto \
+	%{!?nohesiod:--with-hesiod=auto} \
 	--enable-ETRN --enable-NTLM --enable-nls --enable-inet6 \
 %{?nokerberos:--without-kerberos --without-kerberos5 --without-gssapi} \
-%{!?nokerberos:--with-kerberos --with-kerberos5=/usr/kerberos --with-gssapi=/usr/kerberos}
+%{!?nokerberos:--with-kerberos --with-kerberos5 --with-gssapi}
 make
 
 %install
@@ -91,14 +92,27 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Oct 10 2003 Nalin Dahyabhai <nalin@redhat.com> 6.2.0-3.9
+* Fri Oct 10 2003 Nalin Dahyabhai <nalin@redhat.com> 6.2.0-8
 - add patch to not truncate headers which have been munged to include a
-  hostname where one didn't exist before (CAN-2003-0792)
+  hostname where one didn't exist before (CAN-2003-0792), backport from fix
+  for 6.2.4 included in 6.2.5
 
 * Thu Oct  9 2003 Nalin Dahyabhai <nalin@redhat.com>
 - add patch from Markus Friedl to fix possible buffer underrun (CAN-2003-0790)
 
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+* Tue Sep 23 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- allow compiling without hesiod
+
+* Tue Jun 22 2003 Nalin Dahyabhai <nalin@redhat.com> 6.2.0-6
+- rebuild
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Apr 29 2003 Nalin Dahyabhai <nalin@redhat.com>
+- update URLs
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 6.2.0-3
 - rebuilt
 
 * Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 6.2.0-2