diff --git a/.cvsignore b/.cvsignore
index 5e2b691..f191ff3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-freetype-doc-2.3.11.tar.bz2
-ft2demos-2.3.11.tar.bz2
-freetype-2.3.11.tar.bz2
+ft2demos-2.3.12.tar.bz2
+freetype-doc-2.3.12.tar.bz2
+freetype-2.3.12.tar.bz2
diff --git a/freetype-2.3.11-more-demos.patch b/freetype-2.3.11-more-demos.patch
index 4b0046e..181eafe 100644
--- a/freetype-2.3.11-more-demos.patch
+++ b/freetype-2.3.11-more-demos.patch
@@ -1,6 +1,6 @@
-diff -up freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
---- freetype-2.3.11/ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
-+++ freetype-2.3.11/ft2demos-2.3.11/Makefile	2009-10-22 16:02:32.000000000 -0400
+diff -up ft2demos-2.3.11/Makefile.more-demos freetype-2.3.11/ft2demos-2.3.11/Makefile
+--- ft2demos-2.3.11/Makefile.more-demos	2009-10-22 16:02:26.000000000 -0400
++++ ft2demos-2.3.11/Makefile	2009-10-22 16:02:32.000000000 -0400
 @@ -288,10 +288,10 @@ else
    # Note that ttdebug only works if the FreeType's `truetype' driver has
    # been compiled with TT_CONFIG_OPTION_BYTECODE_INTERPRETER defined.
diff --git a/freetype.spec b/freetype.spec
index c281913..226b063 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -6,8 +6,8 @@
 
 Summary: A free and portable font rendering engine
 Name: freetype
-Version: 2.3.11
-Release: 2%{?dist}
+Version: 2.3.12
+Release: 1%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -15,8 +15,6 @@ Source:  http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.
 Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
 Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
 
-# Add -lm when linking X demos
-Patch5: ft2demos-2.1.9-mathlib.patch
 Patch20:  freetype-2.1.10-enable-ft2-bci.patch
 Patch21:  freetype-2.3.0-enable-spr.patch
 
@@ -76,10 +74,6 @@ FreeType.
 %prep
 %setup -q -b 1 -a 2
 
-pushd ft2demos-%{version}
-%patch5 -p1 -b .mathlib
-popd
-
 %patch20  -p1 -b .enable-ft2-bci
 
 %if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
@@ -87,7 +81,10 @@ popd
 %endif
 
 %patch46  -p1 -b .enable-valid
+
+pushd ft2demos-%{version}
 %patch47  -p1 -b .more-demos
+popd
 
 %patch88 -p1 -b .multilib
 
@@ -222,6 +219,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/tutorial
 
 %changelog
+* Thu Feb 23 2010 Behdad Esfahbod <behdad@redhat.com> 2.3.12-1
+- Update to 2.3.12
+- Drop mathlib patch
+
 * Thu Dec  3 2009 Behdad Esfahbod <behdad@redhat.com> 2.3.11-2
 - Drop upstreamed patch.
 - Enable patented bytecode interpretter now that the patents are expired.
diff --git a/ft2demos-2.1.9-mathlib.patch b/ft2demos-2.1.9-mathlib.patch
deleted file mode 100644
index f67b363..0000000
--- a/ft2demos-2.1.9-mathlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 1092b82..e9d5df1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c9d75b659382aef80a8f86efcde08629  freetype-doc-2.3.11.tar.bz2
-7e3df8813fdbad22e996a5dfed7f7361  ft2demos-2.3.11.tar.bz2
-519c7cbf5cbd72ffa822c66844d3114c  freetype-2.3.11.tar.bz2
+ce2811161e779de4eff39bd9d5d916ba  ft2demos-2.3.12.tar.bz2
+2788beb4e1ee01bad8ed9978c0630e86  freetype-doc-2.3.12.tar.bz2
+e974a82e5939be8e05ee65f07275d7c5  freetype-2.3.12.tar.bz2