diff --git a/.cvsignore b/.cvsignore
index b901804..367bdcf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-freetype-2.1.7.tar.bz2
+freetype-2.1.9.tar.bz2
 freetype-pre1.4.tar.bz2
-ft2demos-2.1.7.tar.bz2
-ftdocs-2.1.7.tar.bz2
+ft2demos-2.1.9.tar.bz2
+ftdocs-2.1.9.tar.bz2
diff --git a/freetype.spec b/freetype.spec
index a0cc96b..63b6967 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -10,8 +10,8 @@
 
 Summary: A free and portable TrueType font rendering engine.
 Name: freetype
-Version: 2.1.7
-Release: 5
+Version: 2.1.9
+Release: 1
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -23,14 +23,13 @@ Source3: %{ft1}.tar.bz2
 # Fix build of freetype-1.4 with gcc 3.3
 Patch3: freetype-1.4-ac25.patch
 Patch4: freetype-1.4-gcc33.patch
-# Patch from freetype CVS to fix handling of eexec
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=117743
-Patch5:  freetype-2.1.7-eexec.patch
+# Add -lm when linking X demos
+Patch5: ft2demos-2.1.9-mathlib.patch
 Patch20:  freetype-2.1.3-enable-ft2-bci.patch
 Patch21:  freetype-1.4-disable-ft1-bci.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake14 autoconf >= 2.59 libtool symlinks zlib-devel
+BuildRequires: automake autoconf >= 2.59 libtool symlinks zlib-devel
 
 %description
 The FreeType engine is a free and portable TrueType font rendering
@@ -99,22 +98,24 @@ pushd %{ft1}
 popd
 %endif
 
+pushd ft2demos-%{version}
+%patch5 -p1 -b .mathlib
+popd
+
 %if ! %{without_bytecode_interpreter}
 %patch20  -p0 -b .enable-ft2-bci
 %endif
 
-%patch5 -p1 -b .eexec
-
 # Need to update libtool to get deplibs right for x86_64
 pushd builds/unix
 libtoolize --force
-aclocal-1.4
+aclocal
 autoconf
 popd
 
 pushd %{ft1}
 libtoolize --force
-aclocal-1.4
+aclocal
 autoconf
 popd
 
@@ -262,6 +263,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/
 
 %changelog
+* Wed Aug  4 2004 Owen Taylor <otaylor@redhat.com> - 2.1.9-1
+- Upgrade to 2.1.9
+- Since we are just using automake for aclocal, use it unversioned,
+  instead of specifying 1.4.
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/ft2demos-2.1.9-mathlib.patch b/ft2demos-2.1.9-mathlib.patch
new file mode 100644
index 0000000..f67b363
--- /dev/null
+++ b/ft2demos-2.1.9-mathlib.patch
@@ -0,0 +1,11 @@
+--- ft2demos-2.1.9/graph/x11/rules.mk.mathlib	2004-08-04 16:11:22.534818408 -0400
++++ ft2demos-2.1.9/graph/x11/rules.mk	2004-08-04 16:11:35.317875088 -0400
+@@ -70,7 +70,7 @@
+   ifeq ($(PLATFORM),unix)
+     GRAPH_LINK += $(X11_LIB:%=-R%)
+   endif
+-  GRAPH_LINK += $(X11_LIB:%=-L%) -lX11
++  GRAPH_LINK += $(X11_LIB:%=-L%) -lX11 -lm
+ 
+   # Solaris needs a -lsocket in GRAPH_LINK.
+   #
diff --git a/sources b/sources
index 120e69e..7b5de03 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-d71723948d7c0e44c401b5733c50857e  freetype-2.1.7.tar.bz2
+ec1b903e4be5f073caa72458ea58c29c  freetype-2.1.9.tar.bz2
 609f25b80f9e2c25349127813e10386c  freetype-pre1.4.tar.bz2
-a149198955ed3c614a1af4f17cbfdc53  ft2demos-2.1.7.tar.bz2
-20265f9cd812ed79ddcdbcea1217ae31  ftdocs-2.1.7.tar.bz2
+43ca06d7a926d07db4bbb1885c4a2971  ft2demos-2.1.9.tar.bz2
+db77177afe35955f55bcaa2953724b78  ftdocs-2.1.9.tar.bz2