diff --git a/CIDFnmap b/CIDFnmap
new file mode 100644
index 0000000..2f3d7b7
--- /dev/null
+++ b/CIDFnmap
@@ -0,0 +1,9 @@
+%!
+% following lines are for CJK fonts.
+(CIDFnmap.ja) .runlibfileifexists
+(CIDFnmap.ko) .runlibfileifexists
+(CIDFnmap.zh_CN) .runlibfileifexists
+(CIDFnmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(CIDFnmap.local) .runlibfileifexists
+
diff --git a/FAPIcidfmap b/FAPIcidfmap
index 1be79e7..b2a470b 100644
--- a/FAPIcidfmap
+++ b/FAPIcidfmap
@@ -6,3 +6,5 @@
 (FAPIcidfmap.ko) .runlibfileifexists
 (FAPIcidfmap.zh_CN) .runlibfileifexists
 (FAPIcidfmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(FAPIcidfmap.local) .runlibfileifexists
diff --git a/cidfmap b/cidfmap
index 99c0f4a..18c1786 100644
--- a/cidfmap
+++ b/cidfmap
@@ -6,3 +6,5 @@
 (cidfmap.ko) .runlibfileifexists
 (cidfmap.zh_CN) .runlibfileifexists
 (cidfmap.zh_TW) .runlibfileifexists
+% must be at the bottom of line to allow people overriding everything.
+(cidfmap.local) .runlibfileifexists
diff --git a/ghostscript-Fontmap.local.patch b/ghostscript-Fontmap.local.patch
new file mode 100644
index 0000000..a3b151f
--- /dev/null
+++ b/ghostscript-Fontmap.local.patch
@@ -0,0 +1,8 @@
+--- espgs-8.15.4/lib/Fontmap.Fontmap.local	2007-04-17 11:02:58.000000000 +0100
++++ espgs-8.15.4/lib/Fontmap	2007-04-17 11:03:16.000000000 +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 af71212..3aa7b6a 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,13 +5,14 @@ Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 URL: http://www.cups.org/espgs/
 Group: Applications/Publishing
 Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?gs_rc:test/}espgs-%{gs_ver}%{?gs_rc:gs_rc}-source.tar.bz2
 Source1: FAPIcidfmap
+Source2: CIDFnmap
 Source4: cidfmap
 
 Patch1: ghostscript-multilib.patch
@@ -21,6 +22,7 @@ Patch4: ghostscript-big-cmap-post.patch
 Patch5: ghostscript-split-cidfnmap.patch
 Patch6: ghostscript-gxcht-64bit-crash.patch
 Patch7: ghostscript-dvipdf.patch
+Patch8: ghostscript-Fontmap.local.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -95,6 +97,9 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 # dvipdf script fixes (bug #88906).
 %patch7 -p1 -b .dvipdf
 
+# Allow local overrides for Fontmap (bug #233966).
+%patch8 -p1 -b .Fontmap.local
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -174,6 +179,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap{,.GS}
 # Install our own FAPIcidfmap/cidfmap to allow the separated
 # FAPIcidfmap/cidfmap which the font packages own.
 install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/FAPIcidfmap
+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
 
 # Don't ship sysvlp.sh.
@@ -262,6 +268,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Tue Apr 17 2007 Tim Waugh <twaugh@redhat.com> 8.15.4-3
+- New file CIDFmap (bug #233966).
+- Allow local overrides for FAPIcidfmap, cidfmap and Fontmap (bug #233966).
+
 * Tue Apr  3 2007 Tim Waugh <twaugh@redhat.com> 8.15.4-2
 - Fixed configuration file locations (bug #233966).