diff --git a/ghostscript-Fontmap.local.patch b/ghostscript-Fontmap.local.patch
new file mode 100644
index 0000000..3d1fee2
--- /dev/null
+++ b/ghostscript-Fontmap.local.patch
@@ -0,0 +1,9 @@
+diff -up ghostscript-8.71/Resource/Init/Fontmap.Fontmap.local ghostscript-8.71/Resource/Init/Fontmap
+--- ghostscript-8.71/Resource/Init/Fontmap.Fontmap.local	2008-08-08 05:22:38.000000000 +0100
++++ ghostscript-8.71/Resource/Init/Fontmap	2010-09-03 11:53:47.273865979 +0100
+@@ -2,3 +2,5 @@
+ % See Fontmap.GS for the syntax of real Fontmap files.
+ %% Replace 1 (Fontmap.GS)
+ (Fontmap.GS) .runlibfile
++% must be at the bottom of line to allow people overriding everything.
++(Fontmap.local) .runlibfileifexists
diff --git a/ghostscript.spec b/ghostscript.spec
index 7d656cd..951687f 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 12%{?dist}
+Release: 15%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -42,6 +42,7 @@ Patch23: ghostscript--P-.patch
 Patch24: ghostscript-epstopdf-failure.patch
 Patch25: ghostscript-bbox-close.patch
 Patch26: ghostscript-gdevcups-ripcache.patch
+Patch27: ghostscript-Fontmap.local.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -195,6 +196,10 @@ rm -rf libpng zlib jpeg jasper
 # RIPCache=auto in /etc/cups/cupsd.conf to enable.
 %patch26 -p1 -b .gdevcups-ripcache
 
+# Restored Fontmap.local patch, incorrectly dropped after
+# ghostscript-8.15.4-3 (bug #610301).
+%patch27 -p1 -b .Fontmap.local
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -383,7 +388,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
-* Thu Sep  2 2010 Tim Waugh <twaugh@redhat.com> 8.71-12
+* Fri Sep  3 2010 Tim Waugh <twaugh@redhat.com> 8.71-15
+- Restored Fontmap.local patch, incorrectly dropped after
+  ghostscript-8.15.4-3 (bug #610301).
 - Applied patch to let gdevcups use automatic memory allocation.  Use
   RIPCache=auto in /etc/cups/cupsd.conf to enable.
 - Applied patch to fix NULL dereference in bbox driver (bug #591624).