diff --git a/ghostscript.spec b/ghostscript.spec
index 020fc7d..af71212 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 URL: http://www.cups.org/espgs/
@@ -110,7 +110,9 @@ for path in \
 	%{_datadir}/fonts/default/amspsfnt/pfb \
 	%{_datadir}/fonts/default/cmpsfont/pfb \
 	%{_datadir}/fonts/japanese \
-	%{_sysconfdir}/%{name}
+	%{_datadir}/%{name}/conf.d \
+	%{_sysconfdir}/%{name} \
+	%{_sysconfdir}/%{name}/%{gs_dot_ver}
 do
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
@@ -198,7 +200,12 @@ rm -f $RPM_BUILD_ROOT/usr/lib/cups/filter/pstoraster
 # Don't ship two copies of Resource.  Just the versioned one will do.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/ghostscript/Resource
 
-mkdir -p $RPM_BUILD_ROOT/etc/ghostscript
+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
 
 # The man/de/man1 symlinks are broken (bug #66238).
 find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f
@@ -220,7 +227,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -f rpm.sharelist
 %defattr(-,root,root)
 %dir /etc/ghostscript
+%dir /etc/ghostscript/%{gs_dot_ver}
 %dir %{_datadir}/ghostscript
+%dir %{_datadir}/ghostscript/conf.d
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib
 %dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib/cjkv
@@ -235,6 +244,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/%{gs_dot_ver}
 /usr/lib/cups/filter/pstopxl
 %{_datadir}/cups/model/pxl*
+%config(noreplace) /etc/ghostscript/%{gs_dot_ver}/*
 
 %files gtk
 %defattr(-,root,root)
@@ -252,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Tue Apr  3 2007 Tim Waugh <twaugh@redhat.com> 8.15.4-2
+- Fixed configuration file locations (bug #233966).
+
 * Wed Mar 14 2007 Tim Waugh <twaugh@redhat.com> 8.15.4-1
 - 8.15.4.