diff --git a/fetchmail.spec b/fetchmail.spec
index cc8d6b3..6c1cda8 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -3,7 +3,7 @@
 Summary: A remote mail retrieval and forwarding utility.
 Name: fetchmail
 Version: 6.2.5
-Release: 1
+Release: 2
 Requires: smtpdaemon
 Source0: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz
 Source1: http://www.catb.org/~esr/fetchmail/fetchmail-%{version}.tar.gz.asc
@@ -11,6 +11,7 @@ Source2: 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
 URL: http://www.catb.org/~esr/fetchmail/
 License: GPL
 Group: Applications/Internet
@@ -52,6 +53,7 @@ need to have Python and Tk installed in order to use fetchmailconf.
 %patch0 -p1 -b .krb5-config
 %patch1 -p1 -b .gsspop
 %patch2 -p1 -b .crlf
+%patch3 -p1 -b .popauth
 autoheader
 autoconf
 
@@ -93,6 +95,18 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Apr 21 2004 Nalin Dahyabhai <nalin@redhat.com> 6.2.5-2
+- distill out portions of pop3.c which don't affect capa probing
+
+* Fri Apr 16 2004 Nalin Dahyabhai <nalin@redhat.com>
+- switch to Robert Scheck's fix for capa probing endless loop on pop servers
+  which don't support capa (#115474)
+
+* Thu Apr 15 2004 Nalin Dahyabhai <nalin@redhat.com>
+- split the use-correct-service-name and check-for-gssapi-in-pop portions of
+  gssapi+pop fix into pieces
+- only trigger pop capa probe if authentication method != password
+
 * Mon Mar 15 2004 Nalin Dahyabhai <nalin@redhat.com> 6.2.5-1
 - update to 6.2.5, per Eric's recommendation