diff --git a/ghostscript.spec b/ghostscript.spec
index 274557f..8841f11 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -19,6 +19,7 @@ Patch4: ghostscript-ps2epsi.patch
 Patch5: ghostscript-badc.patch
 Patch6: ghostscript-pagesize.patch
 Patch7: ghostscript-noopt.patch
+Patch8: ghostscript-use-external-freetype.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -89,6 +90,9 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 # Build igcref.c with -O0 to work around bug #150771.
 %patch7 -p1 -b .noopt
 
+# Use external freetype (bug #116638).
+%patch8 -p1 -b .use-external-freetype
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -106,8 +110,11 @@ automake --add-missing --copy || : # Ships with broken symlinks
 make
 cd ..
 
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+FT_CFLAGS=$(pkg-config --cflags freetype2)
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -127,7 +134,8 @@ make install soinstall \
 	gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_ver} \
 	CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \
 	CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
-	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
+	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir` \
+	FT_BRIDGE=1
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
 
@@ -217,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jul 12 2005 Tim Waugh <twaugh@redhat.com>
+- Added use-external-freetype patch (bug #161187).
+
 * Mon Jul 11 2005 Tim Waugh <twaugh@redhat.com>
 - Build requires libtiff-devel (bug #162826).