diff --git a/koffice-2.1.91-kde#235345.patch b/koffice-2.1.91-kde#235345.patch
new file mode 100644
index 0000000..74742d9
--- /dev/null
+++ b/koffice-2.1.91-kde#235345.patch
@@ -0,0 +1,13 @@
+Index: koffice/libs/flake/KoToolBase_p.h
+===================================================================
+--- koffice/libs/flake/KoToolBase_p.h	(revision 1125745)
++++ koffice/libs/flake/KoToolBase_p.h	(revision 1125746)
+@@ -42,7 +42,7 @@
+ 
+     ~KoToolBasePrivate()
+     {
+-        qDeleteAll(optionWidgets);
++        //qDeleteAll(optionWidgets); // disabled means Mem leak, but no crash...
+     }
+ 
+     QMap<QString, QWidget *> optionWidgets; ///< the optionwidgets associated witth this tool
diff --git a/koffice.spec b/koffice.spec
index e6498cf..cbd7800 100644
--- a/koffice.spec
+++ b/koffice.spec
@@ -21,7 +21,7 @@
 Name:           koffice
 Epoch:          3 
 Version:        2.1.91
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -29,6 +29,9 @@ Group:          Applications/Productivity
 License:        GPLv2+
 URL:            http://www.koffice.org/
 Source0:        http://download.kde.org/unstable/koffice-%{version}/koffice-%{version}.tar.bz2
+# don't crash on exit in at least KWord (kde#235345)
+# (workaround from upstream 2.2 branch revision 1125746)
+Patch100:       koffice-2.1.91-kde#235345.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
@@ -455,6 +458,7 @@ Requires:       libxml2-devel
 
 %prep
 %setup -q
+%patch100 -p1 -b .kde#235345
 
 ## kdchart munging begin
 pushd kchart/kdchart
@@ -1130,6 +1134,9 @@ fi
 
 
 %changelog
+* Wed May 12 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3:2.1.91-4
+- apply upstream workaround for KWord crash on exit (kde#235345)
+
 * Tue May 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 3:2.1.91-3
 - rebuild (poppler)