diff --git a/gimp-2.6.11-colorxhtml.patch b/gimp-2.6.11-colorxhtml.patch
new file mode 100644
index 0000000..d75a470
--- /dev/null
+++ b/gimp-2.6.11-colorxhtml.patch
@@ -0,0 +1,43 @@
+From 16bfd230e569709724166670987475756a6d3261 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Tue, 9 Nov 2010 17:45:37 +0100
+Subject: [PATCH] patch: colorxhtml
+
+Squashed commit of the following:
+
+commit f77a97fa0a7178394b81082749d6719849aa1508
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Tue Nov 9 11:28:30 2010 +0100
+
+    colorxhtml: check validity of source_type
+    (cherry picked from commit d2ebadcfb906af972edb95807e2887af4ad76856)
+---
+ plug-ins/pygimp/plug-ins/colorxhtml.py |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/plug-ins/pygimp/plug-ins/colorxhtml.py b/plug-ins/pygimp/plug-ins/colorxhtml.py
+index 0022c65..ed8e52d 100755
+--- a/plug-ins/pygimp/plug-ins/colorxhtml.py
++++ b/plug-ins/pygimp/plug-ins/colorxhtml.py
+@@ -27,7 +27,7 @@ from gimpfu import *
+ 
+ gettext.install("gimp20-python", gimp.locale_directory, unicode=True)
+ 
+-(CHARS_SOURCE, CHARS_FILE, CHARS_PARAMETER) = range(3)
++all_source_types = (CHARS_SOURCE, CHARS_FILE, CHARS_PARAMETER) = range(3)
+ 
+ escape_table = {
+     '&': '&amp;',
+@@ -67,6 +67,9 @@ def colorxhtml(img, drawable, filename, raw_filename,
+     if not drawable.is_rgb or drawable.has_alpha:
+         return
+ 
++    if source_type not in all_source_types:
++        return
++
+     gimp.tile_cache_ntiles(width / gimp.tile_width() + 1)
+ 
+     html = file(filename, 'w')
+-- 
+1.7.3.2
+
diff --git a/gimp.spec b/gimp.spec
index fd9838b..f71e53e 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -131,6 +131,9 @@ Patch3:         gimp-2.6.8-gold.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=623045
 # make script-fu logging IPv6 aware
 Patch4:         gimp-2.6.10-script-fu-ipv6.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=651002
+# avoid traceback in colorxhtml plugin, upstreamed
+Patch5:         gimp-2.6.11-colorxhtml.patch
 # files changed by autoreconf after applying the above
 Patch10:        gimp-2.6.11-1-autoreconf.patch.bz2
 
@@ -215,6 +218,7 @@ EOF
 %patch2 -p1 -b .minimize-dialogs
 %patch3 -p1 -b .gold
 %patch4 -p1 -b .script-fu-ipv6
+%patch5 -p1 -b .colorxhtml
 %patch10 -p1 -b .autoreconf
 
 %build
@@ -478,6 +482,9 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Nov 09 2010 Nils Philippsen <nils@redhat.com> - 2:2.6.11-3
+- avoid traceback in colorxhtml plugin (#651002)
+
 * Sat Nov 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 2:2.6.11-2
 - rebuilt (poppler)