diff --git a/firefox-2.0-pango-ligatures.patch b/firefox-2.0-pango-ligatures.patch
index cfd1da7..a6ae811 100644
--- a/firefox-2.0-pango-ligatures.patch
+++ b/firefox-2.0-pango-ligatures.patch
@@ -118,7 +118,7 @@
  
  nsFontMetricsPango::nsFontMetricsPango()
  {
-@@ -169,14 +228,20 @@ nsFontMetricsPango::Init(const nsFont& a
+@@ -169,15 +228,21 @@ nsFontMetricsPango::Init(const nsFont& a
      mLangGroup = aLangGroup;
  
      // Hang on to the device context
@@ -135,6 +135,7 @@
      // don't make the X server blow up.
      nscoord screenPixels = gdk_screen_height();
      mPointSize = PR_MIN((screenPixels - 1) * FONT_MAX_FONT_SCALE, mPointSize);
+     mPointSize = PR_MIN(2000, mPointSize);
 +#endif
  
      // enumerate over the font names passed in
diff --git a/firefox-2.0.0.10-canvas-load.patch b/firefox-2.0.0.10-canvas-load.patch
deleted file mode 100644
index c09586b..0000000
--- a/firefox-2.0.0.10-canvas-load.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=405584
-https://bugzilla.mozilla.org/show_bug.cgi?id=391028
-
-Index: content/canvas/src/nsCanvasRenderingContext2D.cpp
-===================================================================
-RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v
-retrieving revision 1.102
-diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp
---- content/canvas/src/nsCanvasRenderingContext2D.cpp	10 Oct 2007 20:31:45 -0000	1.102
-+++ content/canvas/src/nsCanvasRenderingContext2D.cpp	11 Oct 2007 23:31:32 -0000
-@@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface
-                                      getter_AddRefs(imgRequest));
-         NS_ENSURE_SUCCESS(rv, rv);
-         if (!imgRequest)
-             // XXX ERRMSG we need to report an error to developers here! (bug 329026)
-             return NS_ERROR_NOT_AVAILABLE;
- 
-         PRUint32 status;
-         imgRequest->GetImageStatus(&status);
--        if (status != imgIRequest::STATUS_LOAD_COMPLETE)
-+        if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0)
-             return NS_ERROR_NOT_AVAILABLE;
- 
-         nsCOMPtr<nsIURI> uri;
-         rv = imageLoader->GetCurrentURI(uriOut);
-         NS_ENSURE_SUCCESS(rv, rv);
- 
-         *forceWriteOnlyOut = PR_FALSE;
- 
diff --git a/firefox.spec b/firefox.spec
index a3ddc6c..8ed1283 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -11,8 +11,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        2.0.0.10
-Release:        2%{?dist}
+Version:        2.0.0.12
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -22,7 +22,7 @@ Group:          Applications/Internet
 %define tarball firefox-2.0rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20071123.tar.bz2
+Source2:        firefox-langpacks-%{version}-20080208.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-prefs.js
@@ -81,8 +81,6 @@ Patch104:       firefox-1.5-ppc64.patch
 
 %endif
 
-Patch200:       firefox-2.0.0.10-canvas-load.patch
-
 
 # ---------------------------------------------------
 
@@ -174,8 +172,6 @@ removed in favor of xulrunner-devel.
 %patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 
-%patch200 -p0 -b .canvas-load
-
 # For branding specific patches.
 
 %if %{official_branding}
@@ -202,9 +198,9 @@ cp %{default_bookmarks_file} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.h
 
 %build
 
-# Build with -Os as it helps the browser; also, don't override mozilla's warning
-# level; they use -Wall but disable a few warnings that show up _everywhere_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+# Don't override mozilla's warning level; they use -Wall
+# but disable a few warnings that show up _everywhere_
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
 
 export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 export PREFIX='%{_prefix}'
@@ -432,6 +428,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Feb  8 2008 Christopher Aillon <caillon@redhat.com> 2.0.0.12-1
+- Update to 2.0.0.12
+
 * Wed Nov 28 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.10-2
 - Make Canvas.drawImage work again
 
diff --git a/sources b/sources
index b95dad4..2a169b2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5c2f13d6a27f462ec6b862dafca22e7b  firefox-2.0.0.10-source.tar.bz2
-368295c3958e2f8f7e7d404b9876f43f  firefox-langpacks-2.0.0.10-20071123.tar.bz2
+361eadc4f2132287f5812762978f43ee  firefox-2.0.0.12-source.tar.bz2
+b7d506ab57a5e43b26ae032b4f6b34b2  firefox-langpacks-2.0.0.12-20080208.tar.bz2