diff --git a/ghostscript-fonts.spec b/ghostscript-fonts.spec
index 1fea978..d756569 100644
--- a/ghostscript-fonts.spec
+++ b/ghostscript-fonts.spec
@@ -1,7 +1,7 @@
 Summary: Fonts for the Ghostscript PostScript interpreter
 Name: ghostscript-fonts
 Version: 5.50
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: Distributable
 Group: Applications/Publishing
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -9,13 +9,12 @@ URL: http://www.gnu.org/software/ghostscript/
 Source: http://ftp.gnu.org/gnu/ghostscript/gnu-gs-fonts-other-%{version}.tar.gz
 Requires: fontconfig
 Requires(post): /usr/bin/mkfontscale /usr/bin/mkfontdir
-Requires(post): /usr/sbin/chkfontpath
 Requires(post): fontconfig
-Requires(postun): /usr/sbin/chkfontpath
 Requires(postun): fontconfig
 BuildArchitectures: noarch
 
 %define fontdir %{_datadir}/fonts/default/ghostscript
+%define catalogue /etc/X11/fontpath.d
 
 %description
 Ghostscript-fonts contains a set of fonts that Ghostscript, a
@@ -32,12 +31,15 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{fontdir}
 cp -p fonts/* $RPM_BUILD_ROOT%{fontdir}
 
+# Install catalogue symlink
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-default
+
 %post
 {
    umask 133
    mkfontscale %{fontdir}
    `which mkfontdir` %{fontdir}
-   /usr/sbin/chkfontpath -q -a %{fontdir}
    fc-cache %{_datadir}/fonts
 } &> /dev/null || :
 
@@ -45,7 +47,6 @@ cp -p fonts/* $RPM_BUILD_ROOT%{fontdir}
 {
    if [ "$1" = "0" ]; then
       fc-cache %{_datadir}/fonts
-      /usr/sbin/chkfontpath -q -r %{fontdir} || :
    fi
 } &> /dev/null || :
 
@@ -55,8 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_datadir}/fonts/default/
+%dir %{catalogue}
+%{catalogue}/fonts-default
 
 %changelog
+* Tue Jun 26 2007 Kristian Høgsberg <krh@redhat.com> - 5.50-17
+- Drop chkfontpath dependency and use the catalogue font path mechanism.
+
 * Wed Feb  7 2007 Tim Waugh <twaugh@redhat.com> 5.50-16
 - Fixed URL again (bug #225794).
 - Fixed requires tags (bug #225794).