diff --git a/fetchmail-6.3.8-long_headers_segfault.patch b/fetchmail-6.3.8-long_headers_segfault.patch
index 49ac8e3..f748ad7 100644
--- a/fetchmail-6.3.8-long_headers_segfault.patch
+++ b/fetchmail-6.3.8-long_headers_segfault.patch
@@ -1,20 +1,52 @@
-# Fixes bug (#354291)
-# Fetchmail segfaulted while retrieving mail with To: header longer than 2048.
-# It had to be invoked with -v -v or higher verbosity level.
 --- report.c
 +++ report.c
-@@ -238,9 +238,13 @@
+@@ -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 
-+	*/
++	/*
++	 * 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.changes b/fetchmail.changes
index faa7220..109a086 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  1 11:53:19 CEST 2008 - puzel@suse.cz
+
+- updated fetchmail-6.3.8-long_headers_segfault.patch from upstream
+
 -------------------------------------------------------------------
 Tue Jun 17 13:20:08 CEST 2008 - puzel@suse.cz
 
diff --git a/fetchmail.spec b/fetchmail.spec
index c0f65d5..788b8f7 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -17,7 +17,7 @@ License:        GPL v2 or later; Other uncritical OpenSource License; Public Dom
 Group:          Productivity/Networking/Email/Utilities
 AutoReqProv:    on
 Version:        6.3.8
-Release:        136
+Release:        139
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.logrotate
@@ -164,6 +164,8 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/fetchmailconf.*
 
 %changelog
+* Tue Jul 01 2008 puzel@suse.cz
+- updated fetchmail-6.3.8-long_headers_segfault.patch from upstream
 * Tue Jun 17 2008 puzel@suse.cz
 - kerberos (krb5) support enabled [bnc#353817]
 * Wed May 28 2008 puzel@suse.cz