diff --git a/gimp-2.6.8-never-stack-trace-desktop.patch b/gimp-2.6.8-never-stack-trace-desktop.patch
new file mode 100644
index 0000000..d342992
--- /dev/null
+++ b/gimp-2.6.8-never-stack-trace-desktop.patch
@@ -0,0 +1,32 @@
+From 0939c40c21d6750e5d65f2c2b34bf8caaad263f5 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 19 Apr 2010 18:05:41 +0200
+Subject: [PATCH] patch: never-stack-trace-desktop
+
+Squashed commit of the following:
+
+commit 9cb13a72dea56cc16d92b2c71ae16803d229b4ec
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Mon Apr 19 18:04:19 2010 +0200
+
+    add --stack-trace-mode=never to desktop file
+---
+ desktop/gimp.desktop.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/desktop/gimp.desktop.in.in b/desktop/gimp.desktop.in.in
+index 776e4ee..639e987 100644
+--- a/desktop/gimp.desktop.in.in
++++ b/desktop/gimp.desktop.in.in
+@@ -4,7 +4,7 @@ Type=Application
+ _Name=GNU Image Manipulation Program
+ _GenericName=Image Editor
+ _Comment=Create images and edit photographs
+-Exec=@GIMP_COMMAND@ %U
++Exec=@GIMP_COMMAND@ --stack-trace-mode=never %U
+ TryExec=gimp-@GIMP_APP_VERSION@
+ Icon=gimp
+ Terminal=false
+-- 
+1.6.6.1
+
diff --git a/gimp.spec b/gimp.spec
index b11b48a..ae20bd1 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.8
-Release:        6%{?dist}
+Release:        7%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -130,6 +130,8 @@ Patch2:         gimp-2.6.6-minimize-dialogs.patch
 Patch3:         gimp-2.6.8-gold.patch
 # backport: statusbar code needed for GTK+ >= 2.19.1 (#559726)
 Patch4:         gimp-2.6.8-gtk219.patch
+# distro-specific: add --stack-trace-mode=never to desktop file
+Patch5:         gimp-2.6.8-never-stack-trace-desktop.patch
 # Makefile.in files generated by Makefile.am changed in patches
 Patch10:        gimp-2.6.8-4-automake.patch.bz2
 
@@ -216,6 +218,7 @@ EOF
 %patch2 -p1 -b .minimize-dialogs
 %patch3 -p1 -b .gold
 %patch4 -p1 -b .gtk219
+%patch5 -p1 -b .never-stack-trace-desktop
 %patch10 -p1 -b .automake
 
 %build
@@ -507,6 +510,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Mon Apr 19 2010 Nils Philippsen <nils@redhat.com> - 2:2.6.8-7
+- add --stack-trace-mode=never to desktop file
+
 * Wed Mar 24 2010 Nils Philippsen <nils@redhat.com> - 2:2.6.8-6
 - backport: statusbar code needed for GTK+ >= 2.19.1 (#559726)