diff --git a/gimp-2.8.4-script-fu-gradient.patch b/gimp-2.8.4-script-fu-gradient.patch
new file mode 100644
index 0000000..585ec89
--- /dev/null
+++ b/gimp-2.8.4-script-fu-gradient.patch
@@ -0,0 +1,35 @@
+From b86a9d6c44b876fcff0e92f63562e6285818abdb Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Wed, 22 May 2013 17:41:22 +0200
+Subject: [PATCH] patch: script-fu-gradient
+
+Squashed commit of the following:
+
+commit f98f40baa057315998ee9272b8bb50eb9a9aa9cd
+Author: Michael Natterer <mitch@gimp.org>
+Date:   Thu Mar 21 01:50:32 2013 +0100
+
+    Bug 696240 - Changing Gradient From Script-Fu Drop Down Causes GIMP to Crash
+
+    gimp_gradient_select_run_callback(): Don't free the color values array
+    twice.
+    (cherry picked from commit ed2849cd5245a4f4f259a261e5d58a1e4fa637ba)
+---
+ app/widgets/gimpgradientselect.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/app/widgets/gimpgradientselect.c b/app/widgets/gimpgradientselect.c
+index 4dc9c23..edb9fea 100644
+--- a/app/widgets/gimpgradientselect.c
++++ b/app/widgets/gimpgradientselect.c
+@@ -187,7 +187,6 @@ gimp_gradient_select_run_callback (GimpPdbDialog  *dialog,
+                                         G_TYPE_NONE);
+ 
+   gimp_array_free (array);
+-  g_free (values);
+ 
+   return return_vals;
+ }
+-- 
+1.8.1.4
+
diff --git a/gimp.spec b/gimp.spec
index c893a2b..6c6b948 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -212,6 +212,9 @@ Patch3:         gimp-2.8.4-mime-types.patch
 # Fix crashes when deleting tags in popups.
 # Upstream commit 37757e4e8dff76715a99394380c8809c5c3f0970
 Patch4:         gimp-2.8.4-tag-popup-crash.patch
+# Fix double-free crashes when selecting gradients from script-fu.
+# Upstream commit 15c5a9db32d49b22260ffde0202f39284b99d936
+Patch5:         gimp-2.8.4-script-fu-gradient.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -301,6 +304,7 @@ EOF
 %patch2 -p1 -b .strict-overflow-warning
 %patch3 -p1 -b .mime-types
 %patch4 -p1 -b .tag-popup-crash
+%patch5 -p1 -b .script-fu-gradient
 
 %build
 %if %{with hardening}
@@ -597,6 +601,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Wed May 22 2013 Nils Philippsen <nils@redhat.com>
 - fix upstream commit ids
+- fix double-free crashes when selecting gradients from script-fu (#964470)
 
 * Sat Apr 20 2013 Nils Philippsen <nils@redhat.com> - 2:2.8.4-3
 - don't crash upon deleting tags in popup (#892828)