diff --git a/FAPIcidfmap b/FAPIcidfmap
deleted file mode 100644
index b2a470b..0000000
--- a/FAPIcidfmap
+++ /dev/null
@@ -1,10 +0,0 @@
-%!
-% Don't change following line. We should ensure that the original one is surely loaded.
-(FAPIcidfmap.GS) .runlibfile
-% following lines are for CJK fonts.
-(FAPIcidfmap.ja) .runlibfileifexists
-(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/ghostscript.spec b/ghostscript.spec
index 8030240..1b95adf 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -11,7 +11,6 @@ License: GPLv2
 URL: http://www.ghostscript.com/
 Group: Applications/Publishing
 Source0: ghostscript-%{gs_ver}.tar.bz2
-Source1: FAPIcidfmap
 Source2: CIDFnmap
 Source4: cidfmap
 
@@ -172,20 +171,12 @@ cd ..
 echo ".so man1/gs.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1
 ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript
 
-###
-### None of this works at the moment because runlibfileifexists is missing
-###
-if false; then
-# Rename an original FAPIcidfmap to FAPIcidfmap.GS
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/FAPIcidfmap{,.GS}
 # Rename an original cidfmap to cidfmap.GS
 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
-fi #false
 
 # Header files.
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/ghostscript
@@ -211,7 +202,6 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/conf.d
 mkdir -p $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}
 touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/Fontmap.local
-touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/FAPIfontmap.local
 touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/cidfmap.local
 touch $RPM_BUILD_ROOT/etc/ghostscript/%{gs_dot_ver}/CIDFnmap.local
 
@@ -272,6 +262,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Wed Nov 28 2007 Tim Waugh <twaugh@redhat.com>
+- Restore cidfmap-switching bits, except for FAPIcidfmap which is no
+  longer used.
 - Add runlibfileifexists to gs_init.ps.
 - Build with --disable-compile-inits (bug #402501).