diff --git a/www/mozilla-firefox/patches/patch-configure_in b/www/mozilla-firefox/patches/patch-configure_in
index 507d0a48d7a..8004131af60 100644
--- a/www/mozilla-firefox/patches/patch-configure_in
+++ b/www/mozilla-firefox/patches/patch-configure_in
@@ -1,25 +1,18 @@
-$OpenBSD: patch-configure_in,v 1.19 2011/03/30 21:39:14 landry Exp $
---- configure.in.orig	Thu Mar  3 23:11:21 2011
-+++ configure.in	Thu Mar 10 15:39:57 2011
-@@ -1229,7 +1229,7 @@ MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPT
- MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
- MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
-+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -L$(LIBXUL_DIST)/bin'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
- XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
-@@ -2676,7 +2676,7 @@ ia64*-hpux*)
+$OpenBSD: patch-configure_in,v 1.20 2011/04/15 11:43:46 landry Exp $
+https://bugzilla.mozilla.org/show_bug.cgi?id=648721
+--- configure.in.orig	Sat Mar 19 00:33:33 2011
++++ configure.in	Mon Apr 11 10:48:46 2011
+@@ -2676,7 +2676,8 @@ ia64*-hpux*)
  	;;
  
  *-openbsd*)
 -    DLL_SUFFIX=".so.1.0"
-+    DLL_SUFFIX=".so.${SO_VERSION}"
++    DLL_SUFFIX='.so.$(if $(SO_VERSION),$(SO_VERSION),1.0)'
++    MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath-link,$(if $(X11BASE),$(X11BASE),/usr/X11R6)/lib'
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -4524,7 +4524,7 @@ if test "$ac_cv_thread_keyword" = yes; then
+@@ -4524,7 +4525,7 @@ if test "$ac_cv_thread_keyword" = yes; then
        :
        ;;
      *)
@@ -28,7 +21,7 @@ $OpenBSD: patch-configure_in,v 1.19 2011/03/30 21:39:14 landry Exp $
        ;;
    esac
  fi
-@@ -5791,14 +5791,7 @@ dnl ==================================================
+@@ -5791,14 +5792,7 @@ dnl ==================================================
  
  # The GNOME component is built if one of 
  # gnome-vfs, gio, gconf or libnotify is available.
diff --git a/www/mozilla-firefox/patches/patch-gfx_ots_include_opentype-sanitiser_h b/www/mozilla-firefox/patches/patch-gfx_ots_include_opentype-sanitiser_h
index ae673eb520b..dc3190d8ece 100644
--- a/www/mozilla-firefox/patches/patch-gfx_ots_include_opentype-sanitiser_h
+++ b/www/mozilla-firefox/patches/patch-gfx_ots_include_opentype-sanitiser_h
@@ -1,5 +1,6 @@
-$OpenBSD: patch-gfx_ots_include_opentype-sanitiser_h,v 1.2 2011/03/30 21:39:14 landry Exp $
+$OpenBSD: patch-gfx_ots_include_opentype-sanitiser_h,v 1.3 2011/04/15 11:43:46 landry Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=643137
+http://hg.mozilla.org/mozilla-central/rev/86d254c4f034
 --- gfx/ots/include/opentype-sanitiser.h.orig	Thu Mar 24 11:31:50 2011
 +++ gfx/ots/include/opentype-sanitiser.h	Thu Mar 24 11:32:45 2011
 @@ -68,8 +68,10 @@ class OTSStream {
diff --git a/www/mozilla-firefox/patches/patch-js_src_Makefile_in b/www/mozilla-firefox/patches/patch-js_src_Makefile_in
index a122278150e..cdd0b39cefb 100644
--- a/www/mozilla-firefox/patches/patch-js_src_Makefile_in
+++ b/www/mozilla-firefox/patches/patch-js_src_Makefile_in
@@ -1,16 +1,13 @@
-$OpenBSD: patch-js_src_Makefile_in,v 1.1 2011/04/05 09:00:42 landry Exp $
-Fix build error on sparc64, we dont want to force-enable assembler/jit
---- js/src/Makefile.in.orig	Thu Mar  3 23:11:32 2011
-+++ js/src/Makefile.in	Sun Mar 13 11:34:19 2011
-@@ -914,7 +914,11 @@ endif
- # Needed to "configure" it correctly.  Unfortunately these
- # flags wind up being applied to all code in js/src, not just
- # the code in js/src/assembler.
-+ifneq (,$(filter-out sparc64,$(TARGET_CPU)))
- CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
-+else
-+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1
-+endif
+$OpenBSD: patch-js_src_Makefile_in,v 1.2 2011/04/15 11:43:46 landry Exp $
+https://bug638056.bugzilla.mozilla.org/attachment.cgi?id=520157
+--- js/src/Makefile.in.orig	Sat Mar 19 00:33:47 2011
++++ js/src/Makefile.in	Fri Apr 15 11:18:48 2011
+@@ -375,7 +375,7 @@ CPPSRCS += 	checks.cc \
+ # END enclude sources for V8 dtoa
+ #############################################
  
- INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
+-ifeq (,$(filter-out powerpc sparc,$(TARGET_CPU)))
++ifeq (,$(filter arm %86 x86_64,$(TARGET_CPU)))
  
+ VPATH +=	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \