diff --git a/ghostscript-icc-fix.patch b/ghostscript-icc-fix.patch
new file mode 100644
index 0000000..05b5b35
--- /dev/null
+++ b/ghostscript-icc-fix.patch
@@ -0,0 +1,199 @@
+diff -up ghostscript-9.00/base/gdevnfwd.c.icc-fix ghostscript-9.00/base/gdevnfwd.c
+--- ghostscript-9.00/base/gdevnfwd.c.icc-fix	2010-08-10 17:20:19.000000000 +0100
++++ ghostscript-9.00/base/gdevnfwd.c	2011-01-07 12:11:25.625149646 +0000
+@@ -1117,3 +1117,29 @@ null_strip_copy_rop(gx_device * dev, con
+ {
+     return 0;
+ }
++
++bool
++fwd_uses_fwd_cmap_procs(gx_device * dev) 
++{
++    const gx_cm_color_map_procs *pprocs;
++
++    pprocs = dev_proc(dev, get_color_mapping_procs)(dev);
++    if (pprocs == &FwdDevice_cm_map_procs) {
++        return true;
++    }
++    return false;
++}
++
++const gx_cm_color_map_procs*
++fwd_get_target_cmap_procs(gx_device * dev)
++{
++    const gx_cm_color_map_procs *pprocs;
++    gx_device_forward * const fdev = (gx_device_forward *)dev;
++    gx_device * const tdev = fdev->target;
++
++    pprocs = dev_proc(tdev, get_color_mapping_procs(tdev));
++    while (pprocs == &FwdDevice_cm_map_procs) {
++        pprocs = fwd_get_target_cmap_procs(tdev);
++    }
++    return pprocs;
++}
+\ No newline at end of file
+diff -up ghostscript-9.00/base/gdevp14.c.icc-fix ghostscript-9.00/base/gdevp14.c
+--- ghostscript-9.00/base/gdevp14.c.icc-fix	2010-09-09 00:20:36.000000000 +0100
++++ ghostscript-9.00/base/gdevp14.c	2011-01-07 12:11:25.629149217 +0000
+@@ -878,7 +878,11 @@ pdf14_pop_transparency_group(gs_imager_s
+                         nos->parent_color_info_procs->num_components, 1,
+                                   false, false, true, tos->planestride, 
+                                   tos->rowstride, num_rows, num_cols);
+-                    /* Transform the data */
++                    /* Transform the data. Since the pdf14 device should be
++                       using RGB, CMYK or Gray buffers, this transform 
++                       does not need to worry about the cmap procs of 
++                       the target device.  Those are handled when we do
++                       the pdf14 put image operation */
+                     gscms_transform_color_buffer(icc_link, &input_buff_desc, 
+                                         &output_buff_desc, tos->data, 
+                                         new_data_buf);
+diff -up ghostscript-9.00/base/gxcmap.c.icc-fix ghostscript-9.00/base/gxcmap.c
+--- ghostscript-9.00/base/gxcmap.c.icc-fix	2010-08-10 17:20:19.000000000 +0100
++++ ghostscript-9.00/base/gxcmap.c	2011-01-07 12:11:25.637148361 +0000
+@@ -31,6 +31,7 @@
+ #include "gsicc_manage.h"
+ #include "gdevdevn.h"
+ #include "gsicc_cache.h"
++#include "gscms.h"
+ 
+ /* Structure descriptor */
+ public_st_device_color();
+@@ -1744,3 +1745,37 @@ cmap_transfer_halftone(gx_color_value *p
+ 
+     }
+ }
++
++bool
++gx_device_uses_std_cmap_procs(gx_device * dev) 
++{
++    const gx_cm_color_map_procs *pprocs;
++
++    if (dev->device_icc_profile != NULL) {
++        pprocs = dev_proc(dev, get_color_mapping_procs)(dev);
++        /* Check if they are forwarding procs */
++        if (fwd_uses_fwd_cmap_procs(dev)) {
++            pprocs = fwd_get_target_cmap_procs(dev);
++        } 
++        switch(dev->device_icc_profile->data_cs) {
++            case gsGRAY:
++                if (pprocs == &DeviceGray_procs) {
++                    return true;
++                }
++                break;
++            case gsRGB:	
++                if (pprocs == &DeviceRGB_procs) {
++                    return true;
++                }
++                break;
++            case gsCMYK:
++                if (pprocs == &DeviceCMYK_procs) {
++                    return true;
++                }
++                break;
++            default:
++                break;
++        }
++    } 
++    return false;
++}
+diff -up ghostscript-9.00/base/gxcmap.h.icc-fix ghostscript-9.00/base/gxcmap.h
+--- ghostscript-9.00/base/gxcmap.h.icc-fix	2007-12-03 21:31:16.000000000 +0000
++++ ghostscript-9.00/base/gxcmap.h	2011-01-07 12:11:25.639148147 +0000
+@@ -284,5 +284,11 @@ dev_proc_decode_color(gx_default_decode_
+  * [0,1]
+  */
+ frac gx_unit_frac(float fvalue);
++/* Determine if the device is using the standard color mapping procs.  In
++   such a case, we can make use of the faster icc color conversions for 
++   images */
++bool gx_device_uses_std_cmap_procs(gx_device * dev);
++bool fwd_uses_fwd_cmap_procs(gx_device * dev);
++const gx_cm_color_map_procs* fwd_get_target_cmap_procs(gx_device * dev);
+ 
+ #endif /* gxcmap_INCLUDED */
+diff -up ghostscript-9.00/base/gxi12bit.c.icc-fix ghostscript-9.00/base/gxi12bit.c
+--- ghostscript-9.00/base/gxi12bit.c.icc-fix	2010-08-10 17:20:19.000000000 +0100
++++ ghostscript-9.00/base/gxi12bit.c	2011-01-07 12:11:25.640148040 +0000
+@@ -113,6 +113,8 @@ static irender_proc(image_render_icc16);
+ irender_proc_t
+ gs_image_class_2_fracs(gx_image_enum * penum)
+ {
++    bool std_cmap_procs;
++
+     if (penum->bps > 8) {
+ 	if (penum->use_mask_color) {
+ 	    /* Convert color mask values to fracs. */
+@@ -122,9 +124,14 @@ gs_image_class_2_fracs(gx_image_enum * p
+ 		penum->mask_color.values[i] =
+ 		    bits2frac(penum->mask_color.values[i], 12);
+ 	}
++        /* If the device has some unique color mapping procs due to its color space,
++           then we will need to use those and go through pixel by pixel instead
++           of blasting through buffers.  This is true for example with many of 
++           the color spaces for CUPs */
++        std_cmap_procs = gx_device_uses_std_cmap_procs(penum->dev);
+         if ( (gs_color_space_get_index(penum->pcs) == gs_color_space_index_DeviceN &&
+             penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color || 
+-            penum->bps != 16 || 
++            penum->bps != 16 || !std_cmap_procs ||
+             gs_color_space_get_index(penum->pcs) == gs_color_space_index_DevicePixel) { 
+             /* DevicePixel color space used in mask from 3x type.  Basically
+                a simple color space that just is scaled to the device bit 
+diff -up ghostscript-9.00/base/gxicolor.c.icc-fix ghostscript-9.00/base/gxicolor.c
+--- ghostscript-9.00/base/gxicolor.c.icc-fix	2010-08-10 17:20:19.000000000 +0100
++++ ghostscript-9.00/base/gxicolor.c	2011-01-07 12:11:25.642147826 +0000
+@@ -97,6 +97,8 @@ get_cie_range( const gs_color_space * pc
+ irender_proc_t
+ gs_image_class_4_color(gx_image_enum * penum)
+ {
++    bool std_cmap_procs;
++
+     if (penum->use_mask_color) {
+ 	/*
+ 	 * Scale the mask colors to match the scaling of each sample to
+@@ -128,8 +130,14 @@ gs_image_class_4_color(gx_image_enum * p
+ 	penum->mask_color.mask = 0;
+ 	penum->mask_color.test = ~0;
+     }
++    /* If the device has some unique color mapping procs due to its color space,
++       then we will need to use those and go through pixel by pixel instead
++       of blasting through buffers.  This is true for example with many of 
++       the color spaces for CUPs */
++    std_cmap_procs = gx_device_uses_std_cmap_procs(penum->dev);
+     if ( (gs_color_space_get_index(penum->pcs) == gs_color_space_index_DeviceN &&
+-        penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color ) {
++        penum->pcs->cmm_icc_profile_data == NULL) || penum->use_mask_color ||
++        !std_cmap_procs) {
+         return &image_render_color_DeviceN;
+     } else {
+         /* Set up the link now */
+diff -up ghostscript-9.00/base/gxiscale.c.icc-fix ghostscript-9.00/base/gxiscale.c
+--- ghostscript-9.00/base/gxiscale.c.icc-fix	2010-08-10 17:20:19.000000000 +0100
++++ ghostscript-9.00/base/gxiscale.c	2011-01-07 12:11:25.644147611 +0000
+@@ -104,6 +104,13 @@ gs_image_class_0_interpolate(gx_image_en
+         != penum->dev->color_info.num_components) {
+         use_icc = false;
+     }
++    /* If the device has some unique color mapping procs due to its color space,
++       then we will need to use those and go through pixel by pixel instead
++       of blasting through buffers.  This is true for example with many of 
++       the color spaces for CUPs */
++    if(!gx_device_uses_std_cmap_procs(penum->dev)) {
++        use_icc = false;
++    }
+ /*
+  * USE_CONSERVATIVE_INTERPOLATION_RULES is normally NOT defined since
+  * the MITCHELL digital filter seems OK as long as we are going out to
+diff -up ghostscript-9.00/base/lib.mak.icc-fix ghostscript-9.00/base/lib.mak
+--- ghostscript-9.00/base/lib.mak.icc-fix	2010-09-09 00:20:36.000000000 +0100
++++ ghostscript-9.00/base/lib.mak	2011-01-07 12:11:25.648147183 +0000
+@@ -602,7 +602,7 @@ $(GLOBJ)gxcmap.$(OBJ) : $(GLSRC)gxcmap.c
+  $(gxalpha_h) $(gxcspace_h) $(gxfarith_h) $(gxfrac_h)\
+  $(gxdcconv_h) $(gxdevice_h) $(gxcmap_h) $(gsnamecl_h) $(gxlum_h)\
+  $(gzstate_h) $(gxdither_h) $(gxcdevn_h) $(string__h)\
+- $(gsicc_manage_h) $(gdevdevn_h) $(gsicc_cache_h)
++ $(gsicc_manage_h) $(gdevdevn_h) $(gsicc_cache_h) $(gscms_h)
+ 	$(GLCC) $(GLO_)gxcmap.$(OBJ) $(C_) $(GLSRC)gxcmap.c
+ 
+ $(GLOBJ)gxcpath.$(OBJ) : $(GLSRC)gxcpath.c $(GXERR)\
diff --git a/ghostscript.spec b/ghostscript.spec
index 6dabad3..011ae60 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -30,6 +30,7 @@ Patch27: ghostscript-Fontmap.local.patch
 Patch28: ghostscript-iccprofiles-initdir.patch
 Patch29: ghostscript-gdevcups-debug-uninit.patch
 Patch30: ghostscript-width-height.patch
+Patch31: ghostscript-icc-fix.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -150,6 +151,9 @@ rm -rf libpng zlib jpeg jasper
 # (upstream bug 691733).
 %patch30 -p1 -b .width-height
 
+# Applied upstream ICC fix (bug #655449).
+%patch31 -p1 -b .icc-fix
+
 # Convert manual pages to UTF-8
 from8859_1() {
         iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -338,6 +342,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Jan  7 2011 Tim Waugh <twaugh@redhat.com> 9.00-8
+- Applied upstream ICC fix (bug #655449).
 - gdevcups: use correct width and height values when allocating memory
   (upstream bug 691733).