diff --git a/fvwm-2.6.5-eventcrash.patch b/fvwm-2.6.5-eventcrash.patch
new file mode 100644
index 0000000..e50c7a2
--- /dev/null
+++ b/fvwm-2.6.5-eventcrash.patch
@@ -0,0 +1,12 @@
+--- fvwm/events.c
++++ fvwm/events.c	2013-07-24 10:29:01.563288010 +0000
+@@ -3383,8 +3383,7 @@ void HandlePropertyNotify(const evh_args
+ 		 * if the icon name is NoName, set the name of the icon to be
+ 		 * the same as the window
+ 		 */
+-		if (!WAS_ICON_NAME_PROVIDED(fw) || (fw->icon_name.name &&
+-			(fw->icon_name.name != fw->name.name)))
++		if (!WAS_ICON_NAME_PROVIDED(fw))
+ 		{
+ 			fw->icon_name = fw->name;
+ 			setup_visible_name(fw, True);
diff --git a/fvwm2.changes b/fvwm2.changes
index b30a571..5f78e2d 100644
--- a/fvwm2.changes
+++ b/fvwm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 24 10:33:41 UTC 2013 - werner@suse.de
+
+- Add patch fvwm-2.6.5-eventcrash.patch which should avoid that not
+  set icon names will be freed  (bnc#778347)
+
 -------------------------------------------------------------------
 Thu Jul 18 11:58:36 UTC 2013 - werner@suse.de
 
diff --git a/fvwm2.spec b/fvwm2.spec
index f7fb09c..07c0cc1 100644
--- a/fvwm2.spec
+++ b/fvwm2.spec
@@ -62,6 +62,8 @@ Patch5:         fvwm-2.5.26-charset_in_title.patch
 Patch7:         fvwm-2.5.26-no-copy-dt-needed-entries.patch
 #PATCH-FIX-OPENSUSE Avoid including internal rsvg-cairo.h
 Patch8:         fvwm-rsvg.patch
+#PATCH-FIX-UPSTREAM Avoid crash due freeing inot set icon names
+Patch9:         fvwm-2.6.5-eventcrash.patch
 #PATCH-FIX-OPENSUSE Update to snapshot 2012/10/11
 Patch42:        fvwm-snapshot.patch
 
@@ -88,7 +90,10 @@ compatible with the Motif MWM.
 %patch3
 %patch5
 %patch7 -p1
+%if 0%{suse_version} > 1220
 %patch8
+%endif
+%patch9
 find . -name *sv_SE* |xargs rename sv_SE sv  
 mkdir icons
 tar -C icons -j -x -v -f $RPM_SOURCE_DIR/fvwm_icons.tar.bz2