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 2c91776..0000000
--- a/fetchmail-6.3.8-CVE-2007-4565.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sink.c
-+++ sink.c
-@@ -262,7 +262,7 @@
-     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-long_headers_segfault.patch b/fetchmail-6.3.8-long_headers_segfault.patch
deleted file mode 100644
index f748ad7..0000000
--- a/fetchmail-6.3.8-long_headers_segfault.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- report.c
-+++ report.c
-@@ -238,11 +238,17 @@
-     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 @@
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
--    va_end (args);
- #else
-     for ( ; ; )
-     {
-@@ -304,12 +309,13 @@
-     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 @@
- 	partial_message_size += 2048;
- 	partial_message = REALLOC (partial_message, partial_message_size);
-     }
--    va_end (args);
- #else
-     for ( ; ; )
-     {
diff --git a/fetchmail-6.3.8.tar.bz2 b/fetchmail-6.3.8.tar.bz2
deleted file mode 100644
index e3b20b2..0000000
--- a/fetchmail-6.3.8.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b
-size 1323515
diff --git a/fetchmail-6.3.9-rc2.tar.bz2 b/fetchmail-6.3.9-rc2.tar.bz2
new file mode 100644
index 0000000..0fcf5a0
--- /dev/null
+++ b/fetchmail-6.3.9-rc2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:742ccb578a329b35be1877911faf886d39316a3aa303c583ec545b745360325f
+size 1284639
diff --git a/fetchmail.changes b/fetchmail.changes
index 14a8f0b..0fc2884 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  4 17:07:26 CEST 2008 - puzel@suse.cz
+
+- update to 6.3.9rc2
+  - bugfix release, see package changelog for details
+- removed fetchmail-6.3.8-CVE-2007-4565.patch (fixed in upstream)
+- removed fetchmail-6.3.8-long_headers_segfault.patch (fixed in upstream)
+
 -------------------------------------------------------------------
 Fri Aug 22 13:58:53 CEST 2008 - puzel@suse.cz
 
diff --git a/fetchmail.spec b/fetchmail.spec
index 4754e8b..a6bb077 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package fetchmail (Version 6.3.8)
+# spec file for package fetchmail (Version 6.3.8.90)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,15 +23,13 @@ BuildRequires:  dante-devel ed krb5-devel openssl-devel opie postfix procmail pw
 License:        GPL v2 or later; Other uncritical OpenSource License; Public Domain, Freeware
 Group:          Productivity/Networking/Email/Utilities
 AutoReqProv:    on
-Version:        6.3.8
-Release:        161
-Source:         %{name}-%{version}.tar.bz2
+Version:        6.3.8.90
+Release:        1
+Source:         %{name}-6.3.9-rc2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.logrotate
 Source3:        sysconfig.%{name}
-Patch0:         fetchmail-6.3.8-CVE-2007-4565.patch
-Patch1:         fetchmail-6.3.8-smtp_errors.patch
-Patch2:         fetchmail-6.3.8-long_headers_segfault.patch
+Patch:          fetchmail-6.3.8-smtp_errors.patch
 PreReq:         %insserv_prereq %fillup_prereq coreutils pwdutils
 Url:            http://fetchmail.berlios.de/
 Icon:	        fetchmail.xpm
@@ -82,10 +80,8 @@ Authors:
     Sunil Shetye <shetye@bombay.retortsoft.com>
 
 %prep
-%setup -q
-%patch0
-%patch1 -p1
-%patch2
+%setup -q -n fetchmail-6.3.9-rc2
+%patch -p1
 cp -a %{S:1} %{S:2} %{S:3} .
 
 %build
@@ -170,6 +166,11 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/fetchmailconf.*
 
 %changelog
+* Thu Sep 04 2008 puzel@suse.cz
+- update to 6.3.9rc2
+  - bugfix release, see package changelog for details
+- removed fetchmail-6.3.8-CVE-2007-4565.patch (fixed in upstream)
+- removed fetchmail-6.3.8-long_headers_segfault.patch (fixed in upstream)
 * Fri Aug 22 2008 puzel@suse.cz
 - fix build on SLE10
   - do not run autoreconf if suse_version < 1010