diff --git a/ghostscript.spec b/ghostscript.spec
index 17d838e..247fa8d 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,7 +1,7 @@
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: 6.51
-Release: 13c
+Release: 16
 License: GPL
 URL: http://gnu-gs.sourceforge.net/
 Group: Applications/Publishing
@@ -51,6 +51,11 @@ Patch15: ghostscript-6.51-Omni_glib.patch
 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
+Patch21: ghostscript-6.51-Omni.090501.update.patch
+Patch22: ghostscript-6.51-Omni_path.patch
+Patch23: ghostscript-6.51-Omni_quiet.patch
  
 # I dont think this patch is needed anymore, so it is not applied.
 # but I might be wrong, and dont really understand it, so it is still
@@ -60,8 +65,9 @@ Patch11: gs5.50-rth.patch
 # xtt-fonts -> ttfonts-ja
 Requires: VFlib2, ttfonts-ja, zlib, libpng, glib
 Requires: urw-fonts >= 1.1, ghostscript-fonts
+Requires: Omni
 BuildRequires: zlib, zlib-devel, libpng, libpng-devel
-BuildRequires: VFlib2-devel, glib-devel
+BuildRequires: VFlib2-devel, glib-devel, XFree86-devel
 BuildPreReq: freetype-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -216,6 +222,15 @@ package.
 	# (this patch must come after the vflib patch)
 %patch15 -p2 -b .Omni_glib
 
+	# Apply appropriate portions of the 090501 update
+%patch21 -p1 -b .Omni.090501
+
+	# Adjust omni to seek in /usr/lib/Omni/ first.
+%patch22 -p1 -b .Omni_path
+
+	# Turn off the debugging output from the gomni driver
+%patch23 -p1 -b .Omni_quiet
+
 
 # Turn on HP's hpijs print driver interface
 	GS_DEVS=$GS_DEVS'$(DD)hpijs.dev $(DD)DJ630.dev $(DD)DJ6xx.dev '
@@ -379,6 +394,12 @@ $(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
 # Fix the gs path in lprsetup.sh
 %patch18 -p1 -b .gs_path
 
+# Stupid ia64 jmp_buf alignment patch
+%patch19 -p1 -b .ia64_jmp_buf
+
+# add -dPARANOIDSAFER to let us breathe a little easier in the print spooler.
+%patch20 -p1 -b .PARANOIDSAFER
+
 # 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
 
@@ -422,8 +443,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
-* Wed Oct 25 2001 Leon Ho <llch@redhat.com> 6.51-13
-- added new CIDFonts for zh_TW, zh_CN
+* Thu Oct 18 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-16
+- update the Omni driver, and patch it to seek in /usr/lib/Omni/ first
+- require Omni
+
+* Mon Oct 01 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-15
+- change -dPARANOIDSAFER to punch a hole for OutputFile
+
+* Mon Sep 17 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-14
+- add -dPARANOIDSAFER to let us breathe a little easier in the print spooler.
+
+* Thu Sep 13 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-13
+- apply jakub's fix to ghostscript's jmp_buf problems; #49591
 
 * Wed Sep  5 2001 Crutcher Dunnavant <crutcher@redhat.com> 6.51-12
 - fix lprsetup.sh; #50925
diff --git a/sources b/sources
index 75d06ba..45b3e18 100644
--- a/sources
+++ b/sources
@@ -3,7 +3,7 @@
 911c7865a83a69135417989dee53f8fc  eplaseren-1.0.2-550.tgz
 2c6ebfe51cab34ee61e3dd524c8640cc  epson740.tgz
 5ed2b4218b8f77cb411f3d2e4509ed24  gdevmd2k-0.2a.tar.gz
-e7f536b02a9ff73d0ebb2f7321293777  ghostscript-6.51-cjk.tar.gz
+ce48f1be1c9a0b8e468b258bc61a98db  ghostscript-6.51-cjk.tar.gz
 6b6d2123daaa1d217aadcbba7f2d6179  ghostscript-6.51.tar.bz2
 d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
 78d6761aab82e70f9c7ee3a1afd72aba  gs6.51-cjk-M2-R1.tar.gz