diff --git a/fetchmail-6.2.5-addrconf.patch b/fetchmail-6.2.5-addrconf.patch
index 116e71c..101fa62 100644
--- a/fetchmail-6.2.5-addrconf.patch
+++ b/fetchmail-6.2.5-addrconf.patch
@@ -1,17 +1,13 @@
-
-Use AI_ADDRCONFIG for name lookups by default.  Don't send this upstream
-as-is since it needs an autoconf test to check whether AI_ADDRCONFIG is safe
-to use in getaddrinfo calls (it isn't in the RHL6.2 resolver, for instance).
-
---- fetchmail-6.2.5/socket.c.addrconf	2003-10-10 11:32:15.000000000 +0100
-+++ fetchmail-6.2.5/socket.c	2004-05-19 13:23:22.000000000 +0100
-@@ -276,6 +276,9 @@
- #endif /* HAVE_SOCKETPAIR */
+diff -up fetchmail-6.3.8/socket.c.addrconf fetchmail-6.3.8/socket.c
+--- fetchmail-6.3.8/socket.c.addrconf	2006-12-17 01:05:31.000000000 +0100
++++ fetchmail-6.3.8/socket.c	2008-09-18 11:37:15.000000000 +0200
+@@ -276,6 +276,9 @@ int SockOpen(const char *host, const cha
+ 
      memset(&req, 0, sizeof(struct addrinfo));
      req.ai_socktype = SOCK_STREAM;
 +#ifdef AI_ADDRCONFIG
 +    req.ai_flags = AI_ADDRCONFIG;
 +#endif
  
-     if (getaddrinfo(host, service, &req, &ai0)) {
- 	report(stderr, GT_("fetchmail: getaddrinfo(%s.%s)\n"), host,service);
+     i = fm_getaddrinfo(host, service, &req, ai0);
+     if (i) {
diff --git a/fetchmail-6.3.8-CVE-2007-4565.patch b/fetchmail-6.3.8-CVE-2007-4565.patch
index 7497e9c..cdca9e7 100644
--- a/fetchmail-6.3.8-CVE-2007-4565.patch
+++ b/fetchmail-6.3.8-CVE-2007-4565.patch
@@ -1,6 +1,7 @@
---- fetchmail-6.3.8/sink.c_old	2007-03-30 00:45:17.000000000 +0200
-+++ fetchmail-6.3.8/sink.c	2007-09-04 13:30:35.000000000 +0200
-@@ -262,7 +262,7 @@
+diff -up fetchmail-6.3.8/sink.c.cve_2007_4565 fetchmail-6.3.8/sink.c
+--- fetchmail-6.3.8/sink.c.cve_2007_4565	2007-03-30 00:45:17.000000000 +0200
++++ fetchmail-6.3.8/sink.c	2008-09-18 11:38:09.000000000 +0200
+@@ -262,7 +262,7 @@ static int send_bouncemail(struct query 
      const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
  
      /* don't bounce in reply to undeliverable bounces */
diff --git a/fetchmail-6.3.8-CVE-2008-2711.patch b/fetchmail-6.3.8-CVE-2008-2711.patch
index c0cc301..15e0b7d 100644
--- a/fetchmail-6.3.8-CVE-2008-2711.patch
+++ b/fetchmail-6.3.8-CVE-2008-2711.patch
@@ -1,6 +1,6 @@
-diff -up fetchmail-6.3.8/report.c_old fetchmail-6.3.8/report.c
---- fetchmail-6.3.8/report.c_old	2008-06-27 11:38:59.000000000 +0200
-+++ fetchmail-6.3.8/report.c	2008-06-27 11:39:22.000000000 +0200
+diff -up fetchmail-6.3.8/report.c.cve_2008_2711 fetchmail-6.3.8/report.c
+--- fetchmail-6.3.8/report.c.cve_2008_2711	2006-03-14 09:53:31.000000000 +0100
++++ fetchmail-6.3.8/report.c	2008-09-18 11:38:50.000000000 +0200
 @@ -238,11 +238,17 @@ report_build (FILE *errfp, message, va_a
      rep_ensuresize();
  
diff --git a/fetchmail.spec b/fetchmail.spec
index b5cf986..fb0678e 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -89,7 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Sep  3 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.8-8
+* Tue Sep 18 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.8-8
+- Rediff all patches to work with patch --fuzz=0
 - Replace server(smtp) requires by procmail
   Resolves: #66396