diff --git a/.cvsignore b/.cvsignore
index 16a3802..e066f4b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -23,3 +23,4 @@ ghostscript-8.60.tar.bz2
 ghostscript-8.61.tar.bz2
 ghostscript-8.62.tar.bz2
 ghostscript-8.63.tar.bz2
+ghostscript-8.64.tar.bz2
diff --git a/ghostscript-CVE-2008-6679.patch b/ghostscript-CVE-2008-6679.patch
deleted file mode 100644
index f77b2f7..0000000
--- a/ghostscript-CVE-2008-6679.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ghostscript-8.63/src/gdevpdtb.c.CVE-2008-6679 ghostscript-8.63/src/gdevpdtb.c
---- ghostscript-8.63/src/gdevpdtb.c.CVE-2008-6679	2008-04-04 09:53:57.000000000 +0100
-+++ ghostscript-8.63/src/gdevpdtb.c	2009-04-15 16:43:11.000000000 +0100
-@@ -133,7 +133,7 @@ pdf_base_font_alloc(gx_device_pdf *pdev,
- 			&st_pdf_base_font, "pdf_base_font_alloc");
-     const gs_font_name *pfname = &font->font_name;
-     gs_const_string font_name;
--    char fnbuf[3 + sizeof(long) / 3 + 1]; /* .F#######\0 */
-+    char fnbuf[2*sizeof(long) + 3]; /* .F########\0 */
-     int code;
- 
-     if (pbfont == 0)
diff --git a/ghostscript-CVE-2009-0196.patch b/ghostscript-CVE-2009-0196.patch
index 9ddac50..5ee8d86 100644
--- a/ghostscript-CVE-2009-0196.patch
+++ b/ghostscript-CVE-2009-0196.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196 ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c
---- ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196	2007-12-11 08:29:58.000000000 +0000
-+++ ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c	2009-04-15 16:40:13.000000000 +0100
+diff -up ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196 ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c
+--- ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.CVE-2009-0196	2007-12-11 08:29:58.000000000 +0000
++++ ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c	2009-04-15 16:27:43.000000000 +0100
 @@ -699,6 +699,15 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
          exrunlength = params->SDNUMEXSYMS;
        else
diff --git a/ghostscript-CVE-2009-0583,0584.patch b/ghostscript-CVE-2009-0583,0584.patch
index 1fa463d..4471433 100644
--- a/ghostscript-CVE-2009-0583,0584.patch
+++ b/ghostscript-CVE-2009-0583,0584.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.63/icclib/icc.c.CVE-2009-0583,0584 ghostscript-8.63/icclib/icc.c
---- ghostscript-8.63/icclib/icc.c.CVE-2009-0583,0584	2008-05-09 05:12:01.000000000 +0100
-+++ ghostscript-8.63/icclib/icc.c	2009-03-20 11:49:28.000000000 +0000
+diff -up ghostscript-8.64/icclib/icc.c.CVE-2009-0583,0584 ghostscript-8.64/icclib/icc.c
+--- ghostscript-8.64/icclib/icc.c.CVE-2009-0583,0584	2008-05-09 05:12:01.000000000 +0100
++++ ghostscript-8.64/icclib/icc.c	2009-07-30 13:29:08.853734640 +0100
 @@ -152,6 +152,8 @@
   *      Various bug fixes and enhancements.
   */
@@ -373,7 +373,7 @@ diff -up ghostscript-8.63/icclib/icc.c.CVE-2009-0583,0584 ghostscript-8.63/iccli
  		return icp->errc = 1;
  	}
  
-+	if (p->clutPoints > 100) {
++	if (p->clutPoints > 255) {
 +		sprintf(icp->err,"icmLut_read: too many clutPoints");
 +		return icp->errc = 1;
 +	}
@@ -987,3 +987,11 @@ diff -up ghostscript-8.63/icclib/icc.c.CVE-2009-0583,0584 ghostscript-8.63/iccli
  	if (p->data == NULL)
  		tp = p->al->malloc(p->al, (p->count+1) * sizeof(icmTag));
  	else
+@@ -12246,6 +12545,7 @@ static icmLuBase* icc_get_luobj (
+ 		if ((blackPointTag = (icmXYZArray *)p->read_tag(p, icSigMediaBlackPointTag)) == NULL
+          || blackPointTag->ttype != icSigXYZType || blackPointTag->size < 1) {
+ 			blackPoint = icmBlack;						/* default */
++			p->errc = 0;	/* reset the error code. black point is NOT required */
+ 		} else 
+ 			blackPoint = blackPointTag->data[0];	/* Copy structure */
+ 	}
diff --git a/ghostscript-CVE-2009-0792.patch b/ghostscript-CVE-2009-0792.patch
index 66072f0..3c40a76 100644
--- a/ghostscript-CVE-2009-0792.patch
+++ b/ghostscript-CVE-2009-0792.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.63/icclib/icc.c.CVE-2009-0792 ghostscript-8.63/icclib/icc.c
---- ghostscript-8.63/icclib/icc.c.CVE-2009-0792	2009-04-15 16:37:49.000000000 +0100
-+++ ghostscript-8.63/icclib/icc.c	2009-04-15 16:38:00.000000000 +0100
+diff -up ghostscript-8.64/icclib/icc.c.CVE-2009-0792 ghostscript-8.64/icclib/icc.c
+--- ghostscript-8.64/icclib/icc.c.CVE-2009-0792	2009-04-15 16:20:04.000000000 +0100
++++ ghostscript-8.64/icclib/icc.c	2009-04-15 16:20:24.000000000 +0100
 @@ -2982,7 +2982,7 @@ static int icmCurve_lookup_fwd(
  			rv |= 1;
  		}
diff --git a/ghostscript-bitcmyk.patch b/ghostscript-bitcmyk.patch
new file mode 100644
index 0000000..718f22b
--- /dev/null
+++ b/ghostscript-bitcmyk.patch
@@ -0,0 +1,35 @@
+diff -up ghostscript-8.64/base/gdevbit.c.bitcmyk ghostscript-8.64/base/gdevbit.c
+--- ghostscript-8.64/base/gdevbit.c.bitcmyk	2008-08-21 00:58:43.000000000 +0100
++++ ghostscript-8.64/base/gdevbit.c	2009-02-17 16:27:38.000000000 +0000
+@@ -653,7 +653,7 @@ bit_put_params(gx_device * pdev, gs_para
+ 		     pdev->color_info.depth == 32 ? cmyk_8bit_map_cmyk_color :
+ 		     bit_map_cmyk_color);
+     }
+-    /* Reset the sparable and linear shift, masks, bits. */
++    /* Reset the separable and linear shift, masks, bits. */
+     set_linear_color_bits_mask_shift(pdev);
+     pdev->color_info.separable_and_linear = GX_CINFO_SEP_LIN;
+     ((gx_device_bit *)pdev)->FirstLine = FirstLine;
+@@ -671,16 +671,18 @@ bit_print_page(gx_device_printer * pdev,
+     byte *in = gs_alloc_bytes(pdev->memory, line_size, "bit_print_page(in)");
+     byte *data;
+     int nul = !strcmp(pdev->fname, "nul") || !strcmp(pdev->fname, "/dev/null");
+-    int lnum = ((gx_device_bit *)pdev)->FirstLine;
+-    int bottom = ((gx_device_bit *)pdev)->LastLine;
++    int lnum = ((gx_device_bit *)pdev)->FirstLine >= pdev->height ?  pdev->height - 1 :
++	    ((gx_device_bit *)pdev)->FirstLine;
++    int bottom = ((gx_device_bit *)pdev)->LastLine >= pdev->height ?  pdev->height - 1 :
++	    ((gx_device_bit *)pdev)->LastLine;
+     int line_count = any_abs(bottom - lnum);
+     int i, step = lnum > bottom ? -1 : 1;
+ 
+     if (in == 0)
+ 	return_error(gs_error_VMerror);
+     if ((lnum == 0) && (bottom == 0))
+-	bottom = pdev->height - 1;
+-    for (i = 0; i < line_count; i++, lnum += step) {
++	line_count = pdev->height - 1;	/* default when LastLine == 0, FirstLine == 0 */
++    for (i = 0; i <= line_count; i++, lnum += step) {
+ 	gdev_prn_get_bits(pdev, lnum, in, &data);
+ 	if (!nul)
+ 	    fwrite(data, 1, line_size, prn_stream);
diff --git a/ghostscript-fPIC.patch b/ghostscript-fPIC.patch
index 9b4deb2..3d64259 100644
--- a/ghostscript-fPIC.patch
+++ b/ghostscript-fPIC.patch
@@ -1,26 +1,7 @@
---- ghostscript-8.60-r8112/src/lib.mak.fPIC	2007-07-10 17:03:11.000000000 +0100
-+++ ghostscript-8.60-r8112/src/lib.mak	2007-07-10 17:05:56.000000000 +0100
-@@ -874,7 +874,7 @@
- $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
-  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
-  $(gstypes_h)
--	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
-+	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
- 
- # Future replacement for gsparams.c
- $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
-@@ -1077,7 +1077,7 @@
- 
- # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
- $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
--	$(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
-+	$(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
- 
- ###### Create a pseudo-"feature" for the entire graphics library.
- 
---- ghostscript-8.60-r8112/src/devs.mak.fPIC	2007-07-10 17:05:00.000000000 +0100
-+++ ghostscript-8.60-r8112/src/devs.mak	2007-07-10 17:05:07.000000000 +0100
-@@ -464,7 +464,7 @@
+diff -up ghostscript-8.64/base/devs.mak.fPIC ghostscript-8.64/base/devs.mak
+--- ghostscript-8.64/base/devs.mak.fPIC	2008-11-07 18:49:34.000000000 +0000
++++ ghostscript-8.64/base/devs.mak	2009-02-04 11:34:21.000000000 +0000
+@@ -456,7 +456,7 @@ $(GLOBJ)gdevx.$(OBJ) : $(GLSRC)gdevx.c $
  	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
  
  $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
@@ -29,3 +10,24 @@
  
  $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
   $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
+diff -up ghostscript-8.64/base/lib.mak.fPIC ghostscript-8.64/base/lib.mak
+--- ghostscript-8.64/base/lib.mak.fPIC	2009-01-08 09:17:18.000000000 +0000
++++ ghostscript-8.64/base/lib.mak	2009-02-04 11:34:21.000000000 +0000
+@@ -894,7 +894,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam
+ $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
+  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
+  $(gstypes_h)
+-	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
++	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
+ 
+ # Future replacement for gsparams.c
+ $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\
+@@ -1085,7 +1085,7 @@ $(GLOBJ)gdevnfwd.$(OBJ) : $(GLSRC)gdevnf
+ 
+ # Provide a mapping between StandardEncoding and ISOLatin1Encoding.
+ $(GLOBJ)gdevemap.$(OBJ) : $(GLSRC)gdevemap.c $(AK) $(std_h)
+-	$(GLCC) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
++	$(GLCCSHARED) $(GLO_)gdevemap.$(OBJ) $(C_) $(GLSRC)gdevemap.c
+ 
+ ###### Create a pseudo-"feature" for the entire graphics library.
+ 
diff --git a/ghostscript-gs-executable.patch b/ghostscript-gs-executable.patch
index 7a1b0bc..7f1a966 100644
--- a/ghostscript-gs-executable.patch
+++ b/ghostscript-gs-executable.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.63/lib/bdftops.gs-executable ghostscript-8.63/lib/bdftops
---- ghostscript-8.63/lib/bdftops.gs-executable	2009-06-10 17:47:31.185482938 +0100
-+++ ghostscript-8.63/lib/bdftops	2009-06-10 17:47:31.187484760 +0100
+diff -up ghostscript-8.64/lib/bdftops.gs-executable ghostscript-8.64/lib/bdftops
+--- ghostscript-8.64/lib/bdftops.gs-executable	2009-06-10 17:55:39.762484085 +0100
++++ ghostscript-8.64/lib/bdftops	2009-06-10 17:55:39.765483778 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -12,9 +12,9 @@ diff -up ghostscript-8.63/lib/bdftops.gs-executable ghostscript-8.63/lib/bdftops
  
 -exec "$GS_EXECUTABLE" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
 +exec "$gs" -q -dBATCH -dNODISPLAY -- bdftops.ps "$@"
-diff -up ghostscript-8.63/lib/dumphint.gs-executable ghostscript-8.63/lib/dumphint
---- ghostscript-8.63/lib/dumphint.gs-executable	2009-06-10 17:47:31.189484085 +0100
-+++ ghostscript-8.63/lib/dumphint	2009-06-10 17:47:31.191484839 +0100
+diff -up ghostscript-8.64/lib/dumphint.gs-executable ghostscript-8.64/lib/dumphint
+--- ghostscript-8.64/lib/dumphint.gs-executable	2009-06-10 17:55:39.767484373 +0100
++++ ghostscript-8.64/lib/dumphint	2009-06-10 17:55:39.823360403 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -30,11 +30,11 @@ diff -up ghostscript-8.63/lib/dumphint.gs-executable ghostscript-8.63/lib/dumphi
  	exit 1
  fi
  
--exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- dumphint.ps "$1"
-+exec "$gs" -q -dNODISPLAY $OPTIONS -- dumphint.ps "$1"
-diff -up ghostscript-8.63/lib/eps2eps.gs-executable ghostscript-8.63/lib/eps2eps
---- ghostscript-8.63/lib/eps2eps.gs-executable	2009-06-10 17:47:31.193483738 +0100
-+++ ghostscript-8.63/lib/eps2eps	2009-06-10 17:47:31.195484763 +0100
+-exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
++exec "$gs" -q -dNODISPLAY $OPTIONS -- "`dirname $0`/dumphint.ps" "$1"
+diff -up ghostscript-8.64/lib/eps2eps.gs-executable ghostscript-8.64/lib/eps2eps
+--- ghostscript-8.64/lib/eps2eps.gs-executable	2009-06-10 17:55:39.846358935 +0100
++++ ghostscript-8.64/lib/eps2eps	2009-06-10 17:55:39.848359175 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -50,11 +50,11 @@ diff -up ghostscript-8.63/lib/eps2eps.gs-executable ghostscript-8.63/lib/eps2eps
  	exit 1
  fi
  
--exec "$GS_EXECUTABLE" -q -sDEVICE=epswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
-+exec "$gs" -q -sDEVICE=epswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
-diff -up ghostscript-8.63/lib/font2c.gs-executable ghostscript-8.63/lib/font2c
---- ghostscript-8.63/lib/font2c.gs-executable	2009-06-10 17:47:31.197483903 +0100
-+++ ghostscript-8.63/lib/font2c	2009-06-10 17:47:31.199484647 +0100
+-exec "$GS_EXECUTABLE" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
++exec "$gs" -q -sDEVICE=epswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH -dSAFER $OPTIONS "$1"
+diff -up ghostscript-8.64/lib/font2c.gs-executable ghostscript-8.64/lib/font2c
+--- ghostscript-8.64/lib/font2c.gs-executable	2009-06-10 17:55:39.850358868 +0100
++++ ghostscript-8.64/lib/font2c	2009-06-10 17:55:39.852359769 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -66,9 +66,9 @@ diff -up ghostscript-8.63/lib/font2c.gs-executable ghostscript-8.63/lib/font2c
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
 +exec "$gs" -q -dNODISPLAY -dWRITESYSTEMDICT -- font2c.ps "$@"
-diff -up ghostscript-8.63/lib/gsbj.gs-executable ghostscript-8.63/lib/gsbj
---- ghostscript-8.63/lib/gsbj.gs-executable	2009-06-10 17:47:31.201483281 +0100
-+++ ghostscript-8.63/lib/gsbj	2009-06-10 17:47:31.203484230 +0100
+diff -up ghostscript-8.64/lib/gsbj.gs-executable ghostscript-8.64/lib/gsbj
+--- ghostscript-8.64/lib/gsbj.gs-executable	2009-06-10 17:55:39.854358559 +0100
++++ ghostscript-8.64/lib/gsbj	2009-06-10 17:55:39.856358929 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -80,9 +80,9 @@ diff -up ghostscript-8.63/lib/gsbj.gs-executable ghostscript-8.63/lib/gsbj
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=bj10e -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.63/lib/gsdj500.gs-executable ghostscript-8.63/lib/gsdj500
---- ghostscript-8.63/lib/gsdj500.gs-executable	2009-06-10 17:47:31.208484529 +0100
-+++ ghostscript-8.63/lib/gsdj500	2009-06-10 17:47:31.210483970 +0100
+diff -up ghostscript-8.64/lib/gsdj500.gs-executable ghostscript-8.64/lib/gsdj500
+--- ghostscript-8.64/lib/gsdj500.gs-executable	2009-06-10 17:55:39.863358659 +0100
++++ ghostscript-8.64/lib/gsdj500	2009-06-10 17:55:39.865358381 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -94,9 +94,9 @@ diff -up ghostscript-8.63/lib/gsdj500.gs-executable ghostscript-8.63/lib/gsdj500
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=djet500 -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.63/lib/gsdj.gs-executable ghostscript-8.63/lib/gsdj
---- ghostscript-8.63/lib/gsdj.gs-executable	2009-06-10 17:47:31.205483180 +0100
-+++ ghostscript-8.63/lib/gsdj	2009-06-10 17:47:31.207483934 +0100
+diff -up ghostscript-8.64/lib/gsdj.gs-executable ghostscript-8.64/lib/gsdj
+--- ghostscript-8.64/lib/gsdj.gs-executable	2009-06-10 17:55:39.858358853 +0100
++++ ghostscript-8.64/lib/gsdj	2009-06-10 17:55:39.860359097 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -108,9 +108,9 @@ diff -up ghostscript-8.63/lib/gsdj.gs-executable ghostscript-8.63/lib/gsdj
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=deskjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.63/lib/gslj.gs-executable ghostscript-8.63/lib/gslj
---- ghostscript-8.63/lib/gslj.gs-executable	2009-06-10 17:47:31.212483852 +0100
-+++ ghostscript-8.63/lib/gslj	2009-06-10 17:47:31.214483814 +0100
+diff -up ghostscript-8.64/lib/gslj.gs-executable ghostscript-8.64/lib/gslj
+--- ghostscript-8.64/lib/gslj.gs-executable	2009-06-10 17:55:39.867359335 +0100
++++ ghostscript-8.64/lib/gslj	2009-06-10 17:55:39.868359409 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -122,9 +122,9 @@ diff -up ghostscript-8.63/lib/gslj.gs-executable ghostscript-8.63/lib/gslj
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=laserjet -r300 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.63/lib/gslp.gs-executable ghostscript-8.63/lib/gslp
---- ghostscript-8.63/lib/gslp.gs-executable	2009-06-10 17:47:31.216483876 +0100
-+++ ghostscript-8.63/lib/gslp	2009-06-10 17:47:31.218484199 +0100
+diff -up ghostscript-8.64/lib/gslp.gs-executable ghostscript-8.64/lib/gslp
+--- ghostscript-8.64/lib/gslp.gs-executable	2009-06-10 17:55:39.870359296 +0100
++++ ghostscript-8.64/lib/gslp	2009-06-10 17:55:39.872359052 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -136,9 +136,9 @@ diff -up ghostscript-8.63/lib/gslp.gs-executable ghostscript-8.63/lib/gslp
  
 -exec "$GS_EXECUTABLE" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
 +exec "$gs" -q -sDEVICE=epson -r180 -dNOPAUSE -sPROGNAME=$0 -- gslp.ps --heading-center "`date`" "$@"
-diff -up ghostscript-8.63/lib/gsnd.gs-executable ghostscript-8.63/lib/gsnd
---- ghostscript-8.63/lib/gsnd.gs-executable	2009-06-10 17:47:31.220484607 +0100
-+++ ghostscript-8.63/lib/gsnd	2009-06-10 17:47:31.222483963 +0100
+diff -up ghostscript-8.64/lib/gsnd.gs-executable ghostscript-8.64/lib/gsnd
+--- ghostscript-8.64/lib/gsnd.gs-executable	2009-06-10 17:55:39.874358723 +0100
++++ ghostscript-8.64/lib/gsnd	2009-06-10 17:55:39.876358801 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -150,9 +150,9 @@ diff -up ghostscript-8.63/lib/gsnd.gs-executable ghostscript-8.63/lib/gsnd
  
 -exec "$GS_EXECUTABLE" -dNODISPLAY "$@"
 +exec "$gs" -dNODISPLAY "$@"
-diff -up ghostscript-8.63/lib/pdf2dsc.gs-executable ghostscript-8.63/lib/pdf2dsc
---- ghostscript-8.63/lib/pdf2dsc.gs-executable	2009-06-10 17:47:31.224483589 +0100
-+++ ghostscript-8.63/lib/pdf2dsc	2009-06-10 17:47:31.226484538 +0100
+diff -up ghostscript-8.64/lib/pdf2dsc.gs-executable ghostscript-8.64/lib/pdf2dsc
+--- ghostscript-8.64/lib/pdf2dsc.gs-executable	2009-06-10 17:55:39.878358517 +0100
++++ ghostscript-8.64/lib/pdf2dsc	2009-06-10 17:55:39.880358835 +0100
 @@ -11,9 +11,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -171,9 +171,9 @@ diff -up ghostscript-8.63/lib/pdf2dsc.gs-executable ghostscript-8.63/lib/pdf2dsc
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
 +exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER\
      -sPDFname="$pdffile" -sDSCname="$dscfile" pdf2dsc.ps -c quit
-diff -up ghostscript-8.63/lib/pdf2ps.gs-executable ghostscript-8.63/lib/pdf2ps
---- ghostscript-8.63/lib/pdf2ps.gs-executable	2009-06-10 17:47:31.228483618 +0100
-+++ ghostscript-8.63/lib/pdf2ps	2009-06-10 17:47:31.230484001 +0100
+diff -up ghostscript-8.64/lib/pdf2ps.gs-executable ghostscript-8.64/lib/pdf2ps
+--- ghostscript-8.64/lib/pdf2ps.gs-executable	2009-06-10 17:55:39.882358707 +0100
++++ ghostscript-8.64/lib/pdf2ps	2009-06-10 17:55:39.884359406 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -191,9 +191,9 @@ diff -up ghostscript-8.63/lib/pdf2ps.gs-executable ghostscript-8.63/lib/pdf2ps
  # appears before other options.
 -exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
 +exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pswrite "-sOutputFile=$outfile" $OPTIONS -c save pop -f "$1"
-diff -up ghostscript-8.63/lib/pdfopt.gs-executable ghostscript-8.63/lib/pdfopt
---- ghostscript-8.63/lib/pdfopt.gs-executable	2009-06-10 17:47:31.232484099 +0100
-+++ ghostscript-8.63/lib/pdfopt	2009-06-10 17:47:31.234484276 +0100
+diff -up ghostscript-8.64/lib/pdfopt.gs-executable ghostscript-8.64/lib/pdfopt
+--- ghostscript-8.64/lib/pdfopt.gs-executable	2009-06-10 17:55:39.886358586 +0100
++++ ghostscript-8.64/lib/pdfopt	2009-06-10 17:55:39.888358849 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -211,9 +211,9 @@ diff -up ghostscript-8.63/lib/pdfopt.gs-executable ghostscript-8.63/lib/pdfopt
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
 +exec "$gs" -q -dNODISPLAY $OPTIONS -- pdfopt.ps "$1" "$2"
-diff -up ghostscript-8.63/lib/pf2afm.gs-executable ghostscript-8.63/lib/pf2afm
---- ghostscript-8.63/lib/pf2afm.gs-executable	2009-06-10 17:47:31.236483632 +0100
-+++ ghostscript-8.63/lib/pf2afm	2009-06-10 17:47:31.238483689 +0100
+diff -up ghostscript-8.64/lib/pf2afm.gs-executable ghostscript-8.64/lib/pf2afm
+--- ghostscript-8.64/lib/pf2afm.gs-executable	2009-06-10 17:55:39.890358746 +0100
++++ ghostscript-8.64/lib/pf2afm	2009-06-10 17:55:39.892358698 +0100
 @@ -10,8 +10,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -225,9 +225,9 @@ diff -up ghostscript-8.63/lib/pf2afm.gs-executable ghostscript-8.63/lib/pf2afm
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
 +exec "$gs" -q -dNODISPLAY -dSAFER -dDELAYSAFER  -- pf2afm.ps "$@"
-diff -up ghostscript-8.63/lib/pfbtopfa.gs-executable ghostscript-8.63/lib/pfbtopfa
---- ghostscript-8.63/lib/pfbtopfa.gs-executable	2009-06-10 17:47:31.240483907 +0100
-+++ ghostscript-8.63/lib/pfbtopfa	2009-06-10 17:47:31.242484154 +0100
+diff -up ghostscript-8.64/lib/pfbtopfa.gs-executable ghostscript-8.64/lib/pfbtopfa
+--- ghostscript-8.64/lib/pfbtopfa.gs-executable	2009-06-10 17:55:39.894358695 +0100
++++ ghostscript-8.64/lib/pfbtopfa	2009-06-10 17:55:39.896359133 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -245,9 +245,9 @@ diff -up ghostscript-8.63/lib/pfbtopfa.gs-executable ghostscript-8.63/lib/pfbtop
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
 +exec "$gs" -q -dNODISPLAY -- pfbtopfa.ps "$1" "$outfile"
-diff -up ghostscript-8.63/lib/pphs.gs-executable ghostscript-8.63/lib/pphs
---- ghostscript-8.63/lib/pphs.gs-executable	2009-06-10 17:47:31.244484337 +0100
-+++ ghostscript-8.63/lib/pphs	2009-06-10 17:47:31.246484364 +0100
+diff -up ghostscript-8.64/lib/pphs.gs-executable ghostscript-8.64/lib/pphs
+--- ghostscript-8.64/lib/pphs.gs-executable	2009-06-10 17:55:39.898358975 +0100
++++ ghostscript-8.64/lib/pphs	2009-06-10 17:55:39.900359087 +0100
 @@ -9,8 +9,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -259,9 +259,9 @@ diff -up ghostscript-8.63/lib/pphs.gs-executable ghostscript-8.63/lib/pphs
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -- pphs.ps "$@"
 +exec "$gs" -q -dNODISPLAY -- pphs.ps "$@"
-diff -up ghostscript-8.63/lib/printafm.gs-executable ghostscript-8.63/lib/printafm
---- ghostscript-8.63/lib/printafm.gs-executable	2009-06-10 17:47:31.248484141 +0100
-+++ ghostscript-8.63/lib/printafm	2009-06-10 17:47:31.250485261 +0100
+diff -up ghostscript-8.64/lib/printafm.gs-executable ghostscript-8.64/lib/printafm
+--- ghostscript-8.64/lib/printafm.gs-executable	2009-06-10 17:55:39.902358678 +0100
++++ ghostscript-8.64/lib/printafm	2009-06-10 17:55:39.904358851 +0100
 @@ -9,8 +9,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -273,9 +273,9 @@ diff -up ghostscript-8.63/lib/printafm.gs-executable ghostscript-8.63/lib/printa
  
 -exec "$GS_EXECUTABLE" -q -dNODISPLAY -- printafm.ps "$@"
 +exec "$gs" -q -dNODISPLAY -- printafm.ps "$@"
-diff -up ghostscript-8.63/lib/ps2epsi.gs-executable ghostscript-8.63/lib/ps2epsi
---- ghostscript-8.63/lib/ps2epsi.gs-executable	2009-06-10 17:47:31.252483864 +0100
-+++ ghostscript-8.63/lib/ps2epsi	2009-06-10 17:47:31.254484749 +0100
+diff -up ghostscript-8.64/lib/ps2epsi.gs-executable ghostscript-8.64/lib/ps2epsi
+--- ghostscript-8.64/lib/ps2epsi.gs-executable	2009-06-10 17:55:39.906359755 +0100
++++ ghostscript-8.64/lib/ps2epsi	2009-06-10 17:55:39.908359051 +0100
 @@ -6,9 +6,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -291,14 +291,14 @@ diff -up ghostscript-8.63/lib/ps2epsi.gs-executable ghostscript-8.63/lib/ps2epsi
  		}
  	' U="$USERNAME$LOGNAME"  F=1 - F=2 "${infile}" >"$tmpfile"
  
--"$GS_EXECUTABLE" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
-+"$gs" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
+-"$GS_EXECUTABLE" -q -sPAPERSIZE=a0 -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
++"$gs" -q -sPAPERSIZE=a0 -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
  rm -f "$tmpfile"
  rm -rf "$tmpdir"
  
-diff -up ghostscript-8.63/lib/ps2pdfwr.gs-executable ghostscript-8.63/lib/ps2pdfwr
---- ghostscript-8.63/lib/ps2pdfwr.gs-executable	2009-06-10 17:47:31.256484129 +0100
-+++ ghostscript-8.63/lib/ps2pdfwr	2009-06-10 17:47:31.258484387 +0100
+diff -up ghostscript-8.64/lib/ps2pdfwr.gs-executable ghostscript-8.64/lib/ps2pdfwr
+--- ghostscript-8.64/lib/ps2pdfwr.gs-executable	2009-06-10 17:55:39.910358261 +0100
++++ ghostscript-8.64/lib/ps2pdfwr	2009-06-10 17:55:39.912359265 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -314,11 +314,11 @@ diff -up ghostscript-8.63/lib/ps2pdfwr.gs-executable ghostscript-8.63/lib/ps2pdf
  
  # We have to include the options twice because -I only takes effect if it
  # appears before other options.
--exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
-+exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
-diff -up ghostscript-8.63/lib/ps2ps.gs-executable ghostscript-8.63/lib/ps2ps
---- ghostscript-8.63/lib/ps2ps.gs-executable	2009-06-10 17:47:31.260483878 +0100
-+++ ghostscript-8.63/lib/ps2ps	2009-06-10 17:47:31.262483424 +0100
+-exec "$GS_EXECUTABLE" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
++exec "$gs" $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr "-sOutputFile=$outfile" $OPTIONS -c .setpdfwrite -f "$infile"
+diff -up ghostscript-8.64/lib/ps2ps.gs-executable ghostscript-8.64/lib/ps2ps
+--- ghostscript-8.64/lib/ps2ps.gs-executable	2009-06-10 17:55:39.914358120 +0100
++++ ghostscript-8.64/lib/ps2ps	2009-06-10 17:55:39.915358850 +0100
 @@ -7,9 +7,8 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
@@ -334,11 +334,11 @@ diff -up ghostscript-8.63/lib/ps2ps.gs-executable ghostscript-8.63/lib/ps2ps
  	exit 1
  fi
  
--exec "$GS_EXECUTABLE" -q -sDEVICE=pswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
-+exec "$gs" -q -sDEVICE=pswrite "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
-diff -up ghostscript-8.63/lib/wftopfa.gs-executable ghostscript-8.63/lib/wftopfa
---- ghostscript-8.63/lib/wftopfa.gs-executable	2009-06-10 17:47:31.264483887 +0100
-+++ ghostscript-8.63/lib/wftopfa	2009-06-10 17:47:31.266484275 +0100
+-exec "$GS_EXECUTABLE" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
++exec "$gs" -q -sDEVICE=pswrite -sstdout=%stderr "-sOutputFile=$2" -dNOPAUSE -dBATCH $OPTIONS "$1"
+diff -up ghostscript-8.64/lib/wftopfa.gs-executable ghostscript-8.64/lib/wftopfa
+--- ghostscript-8.64/lib/wftopfa.gs-executable	2009-06-10 17:55:39.917358998 +0100
++++ ghostscript-8.64/lib/wftopfa	2009-06-10 17:55:39.919358413 +0100
 @@ -6,8 +6,7 @@
  GS_EXECUTABLE=gs
  gs="`dirname $0`/$GS_EXECUTABLE"
diff --git a/ghostscript-jbig2dec-nullderef.patch b/ghostscript-jbig2dec-nullderef.patch
index be04f6c..26a2ed1 100644
--- a/ghostscript-jbig2dec-nullderef.patch
+++ b/ghostscript-jbig2dec-nullderef.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.63/jbig2dec/jbig2_generic.c.jbig2dec-nullderef ghostscript-8.63/jbig2dec/jbig2_generic.c
---- ghostscript-8.63/jbig2dec/jbig2_generic.c.jbig2dec-nullderef	2007-10-25 23:14:22.000000000 +0100
-+++ ghostscript-8.63/jbig2dec/jbig2_generic.c	2009-06-04 12:19:28.538632743 +0100
+diff -up ghostscript-8.64/jbig2dec/jbig2_generic.c.jbig2dec-nullderef ghostscript-8.64/jbig2dec/jbig2_generic.c
+--- ghostscript-8.64/jbig2dec/jbig2_generic.c.jbig2dec-nullderef	2007-10-25 23:14:22.000000000 +0100
++++ ghostscript-8.64/jbig2dec/jbig2_generic.c	2009-06-02 10:45:01.814127074 +0100
 @@ -599,6 +599,10 @@ jbig2_immediate_generic_region(Jbig2Ctx 
    memcpy (params.gbat, gbat, gbat_bytes);
  
@@ -12,9 +12,9 @@ diff -up ghostscript-8.63/jbig2dec/jbig2_generic.c.jbig2dec-nullderef ghostscrip
    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
      "allocated %d x %d image buffer for region decode results",
          rsi.width, rsi.height);
-diff -up ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c
---- ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef	2009-06-04 12:19:22.875757165 +0100
-+++ ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c	2009-06-04 12:19:28.539632281 +0100
+diff -up ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c
+--- ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef	2009-06-02 10:45:01.809127374 +0100
++++ ghostscript-8.64/jbig2dec/jbig2_symbol_dict.c	2009-06-02 10:45:01.814127074 +0100
 @@ -370,6 +370,11 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
  		  memcpy(region_params.gbat, params->sdat, sdat_bytes);
  
@@ -56,9 +56,9 @@ diff -up ghostscript-8.63/jbig2dec/jbig2_symbol_dict.c.jbig2dec-nullderef ghosts
  	  jbig2_image_compose(ctx, glyph, image, 
  		-x, 0, JBIG2_COMPOSE_REPLACE);
  	  x += SDNEWSYMWIDTHS[j];
-diff -up ghostscript-8.63/jbig2dec/jbig2_text.c.jbig2dec-nullderef ghostscript-8.63/jbig2dec/jbig2_text.c
---- ghostscript-8.63/jbig2dec/jbig2_text.c.jbig2dec-nullderef	2008-05-09 15:00:44.000000000 +0100
-+++ ghostscript-8.63/jbig2dec/jbig2_text.c	2009-06-04 12:19:28.549632768 +0100
+diff -up ghostscript-8.64/jbig2dec/jbig2_text.c.jbig2dec-nullderef ghostscript-8.64/jbig2dec/jbig2_text.c
+--- ghostscript-8.64/jbig2dec/jbig2_text.c.jbig2dec-nullderef	2008-05-09 15:00:44.000000000 +0100
++++ ghostscript-8.64/jbig2dec/jbig2_text.c	2009-06-02 10:45:01.816126454 +0100
 @@ -315,6 +315,9 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, 
  		IBO = IB;
  		image = jbig2_image_new(ctx, IBO->width + RDW,
diff --git a/ghostscript-noopt.patch b/ghostscript-noopt.patch
index 3a93580..589cf82 100644
--- a/ghostscript-noopt.patch
+++ b/ghostscript-noopt.patch
@@ -1,6 +1,7 @@
---- ghostscript-7.07/src/int.mak.noopt	2005-03-10 17:22:53.000000000 +0000
-+++ ghostscript-7.07/src/int.mak	2005-03-10 17:24:10.000000000 +0000
-@@ -105,7 +105,7 @@
+diff -up ghostscript-8.64/psi/int.mak.noopt ghostscript-8.64/psi/int.mak
+--- ghostscript-8.64/psi/int.mak.noopt	2008-12-26 07:25:31.000000000 +0000
++++ ghostscript-8.64/psi/int.mak	2009-02-04 11:33:48.000000000 +0000
+@@ -111,7 +111,7 @@ $(PSOBJ)igc.$(OBJ) : $(PSSRC)igc.c $(GH)
  $(PSOBJ)igcref.$(OBJ) : $(PSSRC)igcref.c $(GH) $(memory__h)\
   $(gsexit_h) $(gsstruct_h)\
   $(iastate_h) $(idebug_h) $(igc_h) $(iname_h) $(ipacked_h) $(store_h)
diff --git a/ghostscript-pksmraw.patch b/ghostscript-pksmraw.patch
index 826e000..e713efc 100644
--- a/ghostscript-pksmraw.patch
+++ b/ghostscript-pksmraw.patch
@@ -1,7 +1,7 @@
-diff -up ghostscript-8.62/src/gxclrast.c.pksmraw ghostscript-8.62/src/gxclrast.c
---- ghostscript-8.62/src/gxclrast.c.pksmraw	2008-03-31 17:24:32.000000000 +0100
-+++ ghostscript-8.62/src/gxclrast.c	2008-03-31 17:25:33.000000000 +0100
-@@ -2606,8 +2606,6 @@ static int apply_create_compositor(gx_de
+diff -up ghostscript-8.64/base/gxclrast.c.pksmraw ghostscript-8.64/base/gxclrast.c
+--- ghostscript-8.64/base/gxclrast.c.pksmraw	2008-12-13 20:05:37.000000000 +0000
++++ ghostscript-8.64/base/gxclrast.c	2009-02-04 11:36:25.000000000 +0000
+@@ -2685,8 +2685,6 @@ static int apply_create_compositor(gx_de
          rc_increment(tdev);
          *ptarget = tdev;
      }
diff --git a/ghostscript-runlibfileifexists.patch b/ghostscript-runlibfileifexists.patch
index f375a14..3c14a98 100644
--- a/ghostscript-runlibfileifexists.patch
+++ b/ghostscript-runlibfileifexists.patch
@@ -1,7 +1,7 @@
-diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib/gs_init.ps
---- ghostscript-8.61/lib/gs_init.ps.runlibfileifexists	2007-10-31 17:00:55.000000000 +0000
-+++ ghostscript-8.61/lib/gs_init.ps	2007-11-30 09:02:19.000000000 +0000
-@@ -671,6 +671,14 @@ systemdict /internaldict dup .makeintern
+diff -up ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists ghostscript-8.64/Resource/Init/gs_init.ps
+--- ghostscript-8.64/Resource/Init/gs_init.ps.runlibfileifexists	2009-01-08 09:17:18.000000000 +0000
++++ ghostscript-8.64/Resource/Init/gs_init.ps	2009-02-04 11:35:19.000000000 +0000
+@@ -672,6 +672,14 @@ systemdict /internaldict dup .makeintern
  	   { /undefinedfilename signalerror }
  	  ifelse
  	} bind def
@@ -16,7 +16,7 @@ diff -up ghostscript-8.61/lib/gs_init.ps.runlibfileifexists ghostscript-8.61/lib
  /selectdevice
  	{ finddevice setdevice .setdefaultscreen } bind def
  /signalerror		% <object> <errorname> signalerror -
-@@ -839,6 +847,7 @@ userdict /.currentresourcefile //null pu
+@@ -840,6 +848,7 @@ userdict /.currentresourcefile //null pu
  	} bind def
  % Temporarily substitute it for the real runlibfile.
  /.runlibfile /runlibfile load def
diff --git a/ghostscript-scripts.patch b/ghostscript-scripts.patch
index 9a495f3..f2617f8 100644
--- a/ghostscript-scripts.patch
+++ b/ghostscript-scripts.patch
@@ -1,6 +1,16 @@
---- ghostscript-8.60-r8112/lib/pv.sh.scripts	2007-07-05 11:41:52.000000000 +0100
-+++ ghostscript-8.60-r8112/lib/pv.sh	2007-07-10 16:08:47.000000000 +0100
-@@ -31,7 +31,7 @@
+diff -up ghostscript-8.64/lib/dvipdf.scripts ghostscript-8.64/lib/dvipdf
+--- ghostscript-8.64/lib/dvipdf.scripts	2009-01-10 22:11:18.000000000 +0000
++++ ghostscript-8.64/lib/dvipdf	2009-02-04 11:32:31.000000000 +0000
+@@ -44,4 +44,4 @@ fi
+ 
+ # We have to include the options twice because -I only takes effect if it
+ # appears before other options.
+-exec dvips -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
++exec dvips -R -Ppdf $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sstdout=%stderr -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
+diff -up ghostscript-8.64/lib/pv.sh.scripts ghostscript-8.64/lib/pv.sh
+--- ghostscript-8.64/lib/pv.sh.scripts	2007-07-05 11:41:52.000000000 +0100
++++ ghostscript-8.64/lib/pv.sh	2009-02-04 11:31:32.000000000 +0000
+@@ -31,7 +31,7 @@ fi
  GS_EXECUTABLE=gs
  
  TEMPDIR=.
@@ -9,7 +19,7 @@
  shift
  FILE="$1"
  shift
-@@ -44,7 +44,7 @@
+@@ -44,7 +44,7 @@ else
  	tmpfile="$TEMPDIR/$FILE.$$.pv"
  fi
  trap "rm -rf $tmpfile" 0 1 2 15
@@ -19,11 +29,3 @@
 +dvips -R -p $PAGE -n 1 "$FILE" "$@" -o $tmpfile
  $GS_EXECUTABLE $tmpfile
  exit 0
---- ghostscript-8.60-r8112/lib/dvipdf.scripts	2007-07-10 16:08:57.000000000 +0100
-+++ ghostscript-8.60-r8112/lib/dvipdf	2007-07-10 16:09:17.000000000 +0100
-@@ -44,4 +44,4 @@
- 
- # We have to include the options twice because -I only takes effect if it
- # appears before other options.
--exec dvips $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
-+exec dvips -R $DVIPSOPTIONS -q -f "$infile" | $GS_EXECUTABLE $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
diff --git a/ghostscript-system-jasper.patch b/ghostscript-system-jasper.patch
index 628f7de..444b760 100644
--- a/ghostscript-system-jasper.patch
+++ b/ghostscript-system-jasper.patch
@@ -1,6 +1,6 @@
-diff -up ghostscript-8.61/src/sjpx.c.system-jasper ghostscript-8.61/src/sjpx.c
---- ghostscript-8.61/src/sjpx.c.system-jasper	2008-02-22 14:10:00.000000000 +0000
-+++ ghostscript-8.61/src/sjpx.c	2008-02-22 14:10:15.000000000 +0000
+diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
+--- ghostscript-8.64/base/sjpx.c.system-jasper	2008-08-21 00:22:49.000000000 +0100
++++ ghostscript-8.64/base/sjpx.c	2009-02-04 11:35:56.000000000 +0000
 @@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s
  private_st_jpxd_state(); /* creates a gc object for our state,
  			    defined in sjpx.h */
diff --git a/ghostscript.spec b/ghostscript.spec
index bf250de..a49c10f 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,13 +1,15 @@
-%define gs_ver 8.63
-%define gs_dot_ver 8.63
+%define gs_ver 8.64
+%define gs_dot_ver 8.64
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
-Summary: A PostScript(TM) interpreter and renderer.
+Summary: A PostScript interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 8%{?dist}
+Release: 11%{?dist}
 
-License: GPLv2
+# Included CMap data is Redistributable, no modification permitted,
+# see http://bugzilla.redhat.com/487510
+License: GPLv2 and Redistributable, no modification permitted
 URL: http://www.ghostscript.com/
 Group: Applications/Publishing
 Source0: ghostscript-%{gs_ver}.tar.bz2
@@ -21,10 +23,10 @@ Patch4: ghostscript-fPIC.patch
 Patch5: ghostscript-runlibfileifexists.patch
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
-Patch8: ghostscript-CVE-2009-0583,0584.patch
-Patch9: ghostscript-CVE-2009-0792.patch
-Patch10: ghostscript-CVE-2009-0196.patch
-Patch11: ghostscript-CVE-2008-6679.patch
+Patch8: ghostscript-bitcmyk.patch
+Patch9: ghostscript-CVE-2009-0583,0584.patch
+Patch10: ghostscript-CVE-2009-0792.patch
+Patch11: ghostscript-CVE-2009-0196.patch
 Patch12: ghostscript-jbig2dec-nullderef.patch
 Patch13: ghostscript-gs-executable.patch
 
@@ -48,7 +50,7 @@ Conflicts: ttfonts-zh_CN < 2.12-2
 Conflicts: ttfonts-zh_TW < 2.11-20
 
 %description
-Ghostscript is a set of software that provides a PostScript(TM)
+Ghostscript is a set of software that provides a PostScript
 interpreter, a set of C procedures (the Ghostscript library, which
 implements the graphics capabilities in the PostScript language) and
 an interpreter for Portable Document Format (PDF) files. Ghostscript
@@ -79,7 +81,7 @@ Group: Documentation
 The documentation files that come with ghostscript.
 
 %package gtk
-Summary: A GTK-enabled PostScript(TM) interpreter and renderer.
+Summary: A GTK-enabled PostScript interpreter and renderer.
 Requires: %{name} = %{version}-%{release}
 Group: Applications/Publishing
 
@@ -103,27 +105,27 @@ rm -rf libpng zlib jpeg jasper
 %patch4 -p1 -b .fPIC
 
 # Define .runlibfileifexists.
-%patch5 -p1 -b .runlibfileifexists
+%patch5 -p1
 
 %patch6 -p1 -b .system-jasper
 
 # Fix pksmraw output (bug #308211).  Still needed in 8.63.
 %patch7 -p1 -b .pksmraw
 
+# Fix bitcmyk driver (bug #486644).
+%patch8 -p1 -b .bitcmyk
+
 # Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
 # (bug #487744).
-%patch8 -p1 -b .CVE-2009-0583,0584
+%patch9 -p1 -b .CVE-2009-0583,0584
 
 # Applied patch to fix CVE-2009-0792 (bug #491853).
-%patch9 -p1 -b .CVE-2009-0792
+%patch10 -p1 -b .CVE-2009-0792
 
 # Applied patch to fix CVE-2009-0196 (bug #493379).
-%patch10 -p1 -b .CVE-2009-0196
+%patch11 -p1 -b .CVE-2009-0196
 
-# Applied patch to fix CVE-2008-6679 (bug #493445).
-%patch11 -p1 -b .CVE-2008-6679
-
-# Applied patch to fix NULL dereference in jbig2dec (bug #503991).
+# Applied patch to fix NULL dereference in JBIG2 decoder (bug #501710).
 %patch12 -p1 -b .jbig2dec-nullderef
 
 # Fix scripts so they don't get broken on install (bug #502550).
@@ -182,6 +184,7 @@ make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
 %endif
+make cups
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -194,7 +197,7 @@ make install soinstall \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
 	mandir=$RPM_BUILD_ROOT%{_mandir} \
 	datadir=$RPM_BUILD_ROOT%{_datadir} \
-	gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript \
+	gsincludedir=$RPM_BUILD_ROOT%{_includedir}/ghostscript/ \
 	bindir=$RPM_BUILD_ROOT%{_bindir} \
 	libdir=$RPM_BUILD_ROOT%{_libdir} \
 	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_dot_ver} \
@@ -215,18 +218,15 @@ echo ".so man1/gs.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1
 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
 
 # Rename an original cidfmap to cidfmap.GS
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap{,.GS}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/cidfmap{,.GS}
 # Install our own cidfmap to allow the separated
 # cidfmap which the font packages own.
-install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/CIDFnmap
-install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap
+install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/CIDFnmap
+install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource/Init/cidfmap
 
 # Header files.
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/iapi.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/ierrors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
-install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
+install -m0644 base/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
 # Don't ship pkgconfig files.
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ijs.pc
@@ -239,9 +239,6 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/cups
 rm -f $RPM_BUILD_ROOT%{_libdir}/cups/filter/pstoraster
 rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
 
-# Don't ship two copies of Resource.  Just the versioned one will do.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource
-
 # Don't ship URW fonts; we already have them.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Font
 
@@ -258,8 +255,8 @@ find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
 rm -f $RPM_BUILD_ROOT%{_bindir}/fixmswrd.pl
 
 MAIN_PWD=`pwd`
-(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib -type f | \
-		sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
+(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/Resource -type f | \
+		sed -e 's/\.//;' | grep -v Fontmap | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist
  find .%{_bindir}/ | sed -e 's/\.//;' | \
 		grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \
 		>> $MAIN_PWD/rpm.sharelist)
@@ -278,11 +275,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/ghostscript
 %dir %{_datadir}/ghostscript/conf.d
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}
-%dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib
-%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/gs_init.ps
-%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/Fontmap*
-%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/
+%dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource
+%dir %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init
+%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/gs_init.ps
+%config %{_datadir}/ghostscript/%{gs_dot_ver}/Resource/Init/Fontmap*
 %{_datadir}/ghostscript/%{gs_dot_ver}/examples
+%{_datadir}/ghostscript/%{gs_dot_ver}/lib
 %{_mandir}/man*/*
 %lang(de) %{_mandir}/de/man*/*
 %{_libdir}/libgs.so.*
@@ -292,6 +290,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/cups/filter/pstopxl
 %{_datadir}/cups/model/pxl*
 %config(noreplace) /etc/ghostscript/%{gs_dot_ver}/*
+/usr/lib/cups/filter/pdftoraster
 
 %files doc
 %defattr(-,root,root)
@@ -313,21 +312,41 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
-* Wed Jun 10 2009 Tim Waugh <twaugh@redhat.com> 8.63-8
+* Thu Jul 30 2009 Tim Waugh <twaugh@redhat.com> 8.64-11
+- Fixed CVE-2009-0583,0584 patch by using 255 as the maximum number of
+  points, not 100, and by not treating a missing black point tag as an
+  error (bug #487744).
+
+* Thu Jul 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 8.64-10
+- License: GPLv2 and Redistributable, no modification permitted (bug #487510)
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.64-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jun 10 2009 Tim Waugh <twaugh@redhat.com> 8.64-8
 - Fix scripts so they don't get broken on install (bug #502550).
 
-* Thu Jun  4 2009 Tim Waugh <twaugh@redhat.com> 8.63-7
-- Applied patch to fix NULL dereference in jbig2dec (bug #503991).
+* Thu Jun  4 2009 Tim Waugh <twaugh@redhat.com> 8.64-7
+- Applied patch to fix NULL dereference in JBIG2 decoder (bug #503995).
 
-* Wed Apr 15 2009 Tim Waugh <twaugh@redhat.com> 8.63-6
+* Wed Apr 15 2009 Tim Waugh <twaugh@redhat.com> 8.64-6
 - Applied patch to fix CVE-2009-0792 (bug #491853).
 - Applied patch to fix CVE-2009-0196 (bug #493379).
-- Applied patch to fix CVE-2008-6679 (bug #493445).
 
-* Fri Mar 20 2009 Tim Waugh <twaugh@redhat.com> 8.63-5
+* Fri Mar 20 2009 Tim Waugh <twaugh@redhat.com> 8.64-5
 - Applied patch to fix CVE-2009-0583 (bug #487742) and CVE-2009-0584
   (bug #487744).
 
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.64-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 17 2009 Tim Waugh <twaugh@redhat.com> 8.64-3
+- Fix bitcmyk driver (bug #486644).
+
+* Wed Feb  4 2009 Tim Waugh <twaugh@redhat.com> 8.64-2
+- 8.64 (bug #483958).
+- Removed trade marks to avoid any potential confusion.
+
 * Fri Oct 17 2008 Tim Waugh <twaugh@redhat.com>
 - Removed last patch (unsuccessful).
 
diff --git a/sources b/sources
index aeac024..2d75b17 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-c770eedfdd846a53e211e3ba5339de21  ghostscript-8.63.tar.bz2
+b13289cb2115f38f40c5e064f87e228a  ghostscript-8.64.tar.bz2