diff --git a/firefox-2.0-pango-printing.patch b/firefox-2.0-pango-printing.patch
index 3e34296..bbed21e 100644
--- a/firefox-2.0-pango-printing.patch
+++ b/firefox-2.0-pango-printing.patch
@@ -4567,7 +4567,7 @@ Index: config/system-headers
 ===================================================================
 --- config/system-headers	2006-10-26 12:21:39.000000000 -0400
 +++ config/system-headers	2006-10-26 12:23:29.000000000 -0400
-@@ -180,6 +180,7 @@
+@@ -199,6 +199,7 @@
  freetype/ftoutln.h
  freetype/ttnameid.h
  freetype/tttables.h
@@ -4575,7 +4575,15 @@ Index: config/system-headers
  fribidi/fribidi.h
  FSp_fopen.h
  fstream.h
-@@ -484,6 +485,7 @@
+@@ -208,6 +209,7 @@
+ gdk/gdkevents.h
+ gdk/gdk.h
+ gdk/gdkkeysyms.h
++gdk/gdkpango.h
+ gdk/gdkprivate.h
+ gdk/gdkregion.h
+ gdk/gdkwindow.h
+@@ -501,6 +503,7 @@
  pango/pangofc-fontmap.h
  pango/pango-fontmap.h
  pango/pango.h
@@ -4583,3 +4591,4 @@ Index: config/system-headers
  pango/pangoxft.h
  pango/pangox.h
  pango-types.h
+
diff --git a/firefox.spec b/firefox.spec
index b5b0f82..c488360 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -140,19 +140,19 @@ removed in favor of xulrunner-devel.
 #%patch5  -p1 -b .visibility
 
 #%patch20 -p0
-%patch21 -p1
-%patch22 -p0
+%patch21 -p1 -b .psfonts
+%patch22 -p0 -b .default-applications
 #%patch23 -p0
 #%patch24 -p0
 #%patch25 -p0
 #%patch26 -p0
 #%patch27 -p1
-%patch40 -p1
-%patch42 -p0
-%patch81 -p1
-#%patch82 -p1
-%patch83 -p1
-%patch84 -p0
+%patch40 -p1 -b .bullet-bill
+%patch42 -p0 -b .uriloader
+%patch81 -p1 -b .nopangoxft
+#%patch82 -p1 -b .pango-mathml
+%patch83 -p1 -b .pango-cursor-position
+%patch84 -p0 -b .pango-printing
 
 #%patch100 -p0 -b .gtk-key-theme-crash
 %patch101 -p0 -b .embedwindow-visibility