diff --git a/ghostscript.spec b/ghostscript.spec
index a4e2ada..4720cb2 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -3,17 +3,16 @@ Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-#
-# IMPORTANT!!!!
-#
-# Remember to change gimp_release and hpijs_release before building!
-#
+# Don't build on alpha for the moment.
+ExcludeArch: alpha
 
-Release: 8
+Release: 9.4
 %define gimp_ver 4.2.0
-%define gimp_release 9
 %define hpijs 1.0.2
-%define hpijs_release 8
+Obsoletes: gimp-print-cups
+Provides: gimp-print-cups = %{gimp_ver}
+Obsoletes: hpijs
+Provides: hpijs = %{hpijs}
 
 
 License: GPL
@@ -72,11 +71,12 @@ Patch16: ghostscript-6.51-gdevgdi.patch
 Patch17: ghostscript-6.51-Epson_eplaseren.patch
 Patch18: ghostscript-6.51-gs_path.patch
 Patch19: ghostscript-6.51-ia64_jmp_buf.patch
-Patch20: ghostscript-6.51-PARANOIDSAFER.patch
+Patch20: ghostscript-6.52-security.patch
 Patch21: ghostscript-6.51-Omni.090501.update.patch
 Patch22: ghostscript-6.51-Omni_path.patch
 Patch23: ghostscript-6.51-Omni_quiet.patch
 Patch24: ghostscript-6.53-scripts.patch
+Patch25: ghostscript-6.52-gsj-fixups.patch
 
 # Gimp-print patches
 Patch100: gimp-print-4.2.0-sysconf.patch
@@ -110,30 +110,6 @@ non-PostScript printers, you should install ghostscript. If you
 install ghostscript, you also need to install the ghostscript-fonts
 package.
 
-%package -n hpijs
-Version: %{hpijs}
-Release: %{hpijs_release}
-Summary: HP Printer Drivers
-Requires: %{name}
-Group: Applications/Publishing
-
-%description -n hpijs
-hpijs is a collection of optimized drivers for HP printers.
-hpijs supports the DeskJet 350C, 600C, 600C Photo, 630C, Apollo 2000,
-Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900,
-PhotoSmart, DeskJet 990C and PhotoSmart 100 series.
-
-%package -n gimp-print-cups
-Version: %{gimp_ver}
-Release: %{gimp_release}
-Summary: CUPS drivers for Canon, Epson, HP and compatible printers
-Requires: cups >= 1.1.12
-Group: Applications/Publishing
-
-%description -n gimp-print-cups
-gimp-print-cups provides native CUPS support for a wide range of Canon,
-Epson, HP and compatible printers.
-
 %prep
 %setup -q -a 10
 
@@ -497,7 +473,12 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev
 %patch19 -p1 -b .ia64_jmp_buf
 
 # add -dPARANOIDSAFER to let us breathe a little easier in the print spooler.
-%patch20 -p1 -b .PARANOIDSAFER
+# Also restrict execution of commands.  This patch is derived from the
+# 6.53 patch.
+%patch20 -p1 -b .security
+
+# Fix-up gdevdmpr.c
+%patch25 -p1 -b .gsj-fixups
 
 # Set up for a unix os, gcc compiler build, and replace our insertion string
 sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile
@@ -536,26 +517,34 @@ ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
 
 cp -a Resource $RPM_BUILD_ROOT/usr/share/ghostscript/
 
-MAIN_PWD=`pwd`
-(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_ver}/lib/* | \
-		sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist)
-
 # Don't ship sysvlp.sh.
 rm -f $RPM_BUILD_ROOT/usr/bin/sysvlp.sh
 
+MAIN_PWD=`pwd`
+cd $RPM_BUILD_ROOT
+ls -1 ./usr/share/ghostscript/%{gs_ver}/lib/* | \
+	sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps \
+	> $MAIN_PWD/rpm.sharelist
+ls -1 ./usr/bin/* | sed -e 's/\.//;' | \
+	grep -v '\(hpijs\|gimpprint-config\|cups-calibrate\|escputil\)' \
+	>> $MAIN_PWD/rpm.sharelist
+ls -1 ./usr/share/man/man1/* | sed -e 's/\.//;' -e 's/$/*/;' | \
+	grep -v '\(escputil\|gimpprint\)' \
+	>> $MAIN_PWD/rpm.sharelist
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n gimp-print-cups
+%post
 /sbin/install-info /usr/share/info/gimpprint.info.gz /usr/share/info/dir
 /sbin/ldconfig
 
-%preun -n gimp-print-cups
+%preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete /usr/share/info/gimpprint.info.gz /usr/share/info/dir
 fi
 
-%postun -n gimp-print-cups
+%postun
 if [ "$1" -ge "1" ]; then
   /sbin/service cups condrestart >/dev/null 2>&1
 fi
@@ -563,7 +552,6 @@ fi
 
 %files -f rpm.sharelist
 %defattr(-,root,root)
-%{_bindir}/*
 %dir %{_datadir}/ghostscript
 %dir %{_datadir}/ghostscript/%{gs_ver}
 %dir %{_datadir}/ghostscript/%{gs_ver}/lib
@@ -572,18 +560,12 @@ fi
 %{_datadir}/ghostscript/Resource/
 %{_datadir}/ghostscript/%{gs_ver}/vflib
 %{_datadir}/ghostscript/%{gs_ver}/examples
-%{_mandir}/*/*
 %doc %{_docdir}/%{name}-%{gs_ver}
-
-%files -n hpijs
-%defattr(-,root,root)
 %{_bindir}/hpijs
 %{_docdir}/hpijs-%{hpijs}
-
-%files -n gimp-print-cups
-%defattr(-,root,root)
 %{_includedir}/gimp-print
 %{_mandir}/man1/gimpprint-config.1*
+%{_mandir}/man1/escputil.1*
 %{_mandir}/man3/gimpprint.3*
 %{_mandir}/man8/cups-calibrate.8*
 %{_libdir}/libgimpprint*
@@ -606,6 +588,13 @@ fi
 %lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/gimp-print.mo
 
 %changelog
+* Wed May 29 2002 Tim Waugh <twaugh@redhat.com> 6.52-9.4
+- Add missing security patch from 6.53.
+- Add pdf2dsc.ps patch from CVS.
+- Add ps2epsi.ps patch from CVS.
+- Fix file lists.
+- Merge packages to make RHN happy.
+
 * Wed Apr  3 2002 Tim Waugh <twaugh@redhat.com> 6.52-8
 - New CIDFonts (bug #61015).