diff --git a/fetchmail-6.3.8-long_headers_segfault.patch b/fetchmail-6.3.8-long_headers_segfault.patch
new file mode 100644
index 0000000..49ac8e3
--- /dev/null
+++ b/fetchmail-6.3.8-long_headers_segfault.patch
@@ -0,0 +1,20 @@
+# 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 @@
+     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);
+ 
diff --git a/fetchmail.changes b/fetchmail.changes
index 8fe19fe..11417b4 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 22 17:44:06 CEST 2008 - puzel@suse.cz
+
+- fixed bnc#354291
+  * caused segmentation fault when retrieving mail with long To:
+    headers
+	
 -------------------------------------------------------------------
 Wed Apr 30 17:49:47 CEST 2008 - pcerny@suse.cz
 
diff --git a/fetchmail.spec b/fetchmail.spec
index c9cdaed..e922748 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -17,13 +17,14 @@ License:        GPL v2 or later; Other uncritical OpenSource License; Public Dom
 Group:          Productivity/Networking/Email/Utilities
 AutoReqProv:    on
 Version:        6.3.8
-Release:        123
+Release:        130
 Source:         %{name}-%{version}.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
 PreReq:         %insserv_prereq %fillup_prereq coreutils pwdutils
 Url:            http://www.fetchmail.info/
 Icon:	        fetchmail.xpm
@@ -79,6 +80,7 @@ Authors:
 %setup -q
 %patch0
 %patch1 -p1
+%patch2
 cp -a %{S:1} %{S:2} %{S:3} .
 
 %build
@@ -161,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/fetchmailconf.*
 
 %changelog
+* Thu May 22 2008 puzel@suse.cz
+- fixed bnc#354291
+  * caused segmentation fault when retrieving mail with long To:
+  headers
 * Wed Apr 30 2008 pcerny@suse.cz
 - added option to specify polling interval to init script
 * Fri Mar 28 2008 pcerny@suse.cz