diff --git a/fetchmail.spec b/fetchmail.spec
index ebc442d..88183b3 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,7 +1,8 @@
+%define fetchmailconf 0
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 5.9.0
-Release: 11
+Release: 15
 Requires: smtpdaemon
 Source: http://www.tuxedo.org/~esr/fetchmail/fetchmail-%{version}.tar.gz
 Source1: fetchmailconf.1
@@ -11,8 +12,11 @@ URL: http://www.tuxedo.org/~esr/fetchmail/
 License: GPL
 Group: Applications/Internet
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildPrereq: openssl-devel
+BuildPrereq: autoconf, automake, hesiod-devel, openssl-devel
 %{!?nokerberos:BuildPrereq: krb5-devel}
+%if ! %{fetchmailconf}
+Obsoletes: fetchmailconf
+%endif
 
 %package -n fetchmailconf
 Summary: A GUI utility for configuring your fetchmail preferences.
@@ -44,11 +48,11 @@ need to have Python and Tk installed in order to use fetchmailconf.
 %patch0 -p1 -b .configure
 %patch1 -p1 -b .trusty
 aclocal
-autoconf
+autoconf -f
 
 %build
 LIBS=-ldl; export LIBS
-%configure --enable-POP3 --enable-IMAP --with-ssl=/usr \
+%configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
 	--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}
@@ -71,12 +75,29 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/fetchmail
 %{_mandir}/man1/fetchmail.1*
 
+%if %{fetchmailconf}
 %files -n fetchmailconf
 %defattr(-,root,root)
 %{_bindir}/fetchmailconf
 %{_mandir}/man1/fetchmailconf.1*
+%endif
 
 %changelog
+* Tue Jun 11 2002 Nalin Dahyabhai <nalin@redhat.com> 5.9.0-15
+- remove and obsolete the fetchmailconf subpackage (tkinter is gone, so it
+  can't be run)
+
+* Mon Jun  3 2002 Nalin Dahyabhai <nalin@redhat.com> 5.9.0-14
+- require hesiod at build-time
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Fri May 17 2002 Nalin Dahyabhai <nalin@redhat.com> 5.9.0-12
+- rebuild in new environment
+- require autoconf213
+- enable hesiod support
+
 * Wed May  1 2002 Nalin Dahyabhai <nalin@redhat.com> 5.9.0-11
 - rebuild