diff --git a/.cvsignore b/.cvsignore
index b918fd0..2907d26 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,5 @@ fetchmail-6.3.7.tar.bz2
 fetchmail-6.3.7.tar.bz2.asc
 fetchmail-6.3.8.tar.bz2
 fetchmail-6.3.8.tar.bz2.asc
+fetchmail-6.3.9.tar.bz2
+fetchmail-6.3.9.tar.bz2.asc
diff --git a/fetchmail-6.3.8-CVE-2007-4565.patch b/fetchmail-6.3.8-CVE-2007-4565.patch
deleted file mode 100644
index cdca9e7..0000000
--- a/fetchmail-6.3.8-CVE-2007-4565.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 */
--    if (!msg->return_path[0] ||
-+    if (!msg || !msg->return_path[0] ||
- 	strcmp(msg->return_path, "<>") == 0 ||
- 	strcasecmp(msg->return_path, md1) == 0 ||
- 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
diff --git a/fetchmail-6.3.8-CVE-2008-2711.patch b/fetchmail-6.3.8-CVE-2008-2711.patch
deleted file mode 100644
index 15e0b7d..0000000
--- a/fetchmail-6.3.8-CVE-2008-2711.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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();
- 
- #if defined(VA_START)
--    VA_START (args, message);
-     for ( ; ; )
-     {
-+	/*
-+	 * args has to be initialized before every call of vsnprintf(), 
-+	 * because vsnprintf() invokes va_arg macro and thus args is 
-+	 * undefined after the call.
-+	 */
-+	VA_START(args, message);
- 	n = vsnprintf (partial_message + partial_message_size_used, partial_message_size - partial_message_size_used,
- 		       message, args);
-+	va_end (args);
- 
- 	if (n >= 0
- 	    && (unsigned)n < partial_message_size - partial_message_size_used)
-@@ -254,7 +260,6 @@ report_build (FILE *errfp, message, va_a
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
--    va_end (args);
- #else
-     for ( ; ; )
-     {
-@@ -304,12 +309,13 @@ report_complete (FILE *errfp, message, v
-     rep_ensuresize();
- 
- #if defined(VA_START)
--    VA_START (args, message);
-     for ( ; ; )
-     {
-+	VA_START(args, message);
- 	n = vsnprintf (partial_message + partial_message_size_used,
- 		       partial_message_size - partial_message_size_used,
- 		       message, args);
-+	va_end(args);
- 
- 	/* old glibc versions return -1 for truncation */
- 	if (n >= 0
-@@ -322,7 +328,6 @@ report_complete (FILE *errfp, message, v
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
--    va_end (args);
- #else
-     for ( ; ; )
-     {
diff --git a/fetchmail.spec b/fetchmail.spec
index e0a2ded..5d2278f 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -3,14 +3,12 @@
 
 Summary: A remote mail retrieval and forwarding utility
 Name: fetchmail
-Version: 6.3.8
-Release: 8%{?dist}
+Version: 6.3.9
+Release: 1%{?dist}
 Requires: procmail
 Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2
 Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc
 Patch0: fetchmail-6.2.5-addrconf.patch
-Patch1: fetchmail-6.3.8-CVE-2007-4565.patch
-Patch2: fetchmail-6.3.8-CVE-2008-2711.patch
 URL: http://fetchmail.berlios.de/
 # For a breakdown of the licensing, see COPYING
 License: GPL+ and Public Domain
@@ -49,8 +47,6 @@ need to have Python and Tk installed in order to use fetchmailconf.
 %prep
 %setup -q
 %patch0 -p1 -b .addrconf
-%patch1 -p1 -b .cve_2007_4565
-%patch2 -p1 -b .cve_2008_2711
 
 %build
 %configure --enable-POP3 --enable-IMAP --with-ssl --with-hesiod \
@@ -89,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Dec  3 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.3.9-1
+- Update to fetchmail-6.3.9
+
 * 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
diff --git a/sources b/sources
index 529cba6..ad73481 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-66b97500b0a1e3c0916b3b5314f597f5  fetchmail-6.3.8.tar.bz2
-2d39acb42b9fe5837d53110df999dab9  fetchmail-6.3.8.tar.bz2.asc
+72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
+f8a950df048af14ee80728341bca1426  fetchmail-6.3.9.tar.bz2.asc