diff --git a/.cvsignore b/.cvsignore
index 57f4510..ed42af0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -17,3 +17,4 @@ espgs-8.15.1-source.tar.bz2
 adobe-cmaps-200406.tar.gz
 espgs-8.15.2-source.tar.bz2
 espgs-8.15.3-source.tar.bz2
+espgs-8.15.4-source.tar.bz2
diff --git a/ghostscript-dvipdf.patch b/ghostscript-dvipdf.patch
index c63db86..fff7f90 100644
--- a/ghostscript-dvipdf.patch
+++ b/ghostscript-dvipdf.patch
@@ -1,8 +1,8 @@
---- espgs-8.15.3/lib/dvipdf.dvipdf	2007-01-25 12:14:49.000000000 +0000
-+++ espgs-8.15.3/lib/dvipdf	2007-01-25 12:15:02.000000000 +0000
-@@ -37,4 +37,4 @@
+--- espgs-8.15.4/lib/dvipdf.dvipdf	2006-11-30 15:41:51.000000000 +0000
++++ espgs-8.15.4/lib/dvipdf	2007-03-14 21:51:59.000000000 +0000
+@@ -39,4 +39,4 @@
  
  # We have to include the options twice because -I only takes effect if it
  # appears before other options.
--exec dvips -q -f "$infile" | gs $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
-+exec dvips -R -q -f "$infile" | gs $OPTIONS -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
+-exec dvips $DVIPSOPTIONS -q -f "$infile" | gs $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
++exec dvips $DVIPSOPTIONS -R -q -f "$infile" | gs $OPTIONS -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile="$outfile" $OPTIONS -c .setpdfwrite -
diff --git a/ghostscript.spec b/ghostscript.spec
index ca378fb..020fc7d 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -1,11 +1,11 @@
-%define gs_ver 8.15.3
+%define gs_ver 8.15.4
 %define gs_dot_ver 8.15
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 7%{?dist}
+Release: 1%{?dist}
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -252,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Wed Mar 14 2007 Tim Waugh <twaugh@redhat.com> 8.15.4-1
+- 8.15.4.
+
 * Thu Jan 25 2007 Tim Waugh <twaugh@redhat.com> 8.15.3-7
 - dvipdf script fixes (bug #88906).
 - Moved libijs.so and libgs.so into devel package (bug #203623).
diff --git a/sources b/sources
index 4134e52..fdff8da 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-4ec87a3da20c1b433ffbe0ffe3675fcd  espgs-8.15.3-source.tar.bz2
+e74e0463e0bfb1cea3db245d8e71828c  espgs-8.15.4-source.tar.bz2