diff --git a/www/fennec/patches/patch-js_src_Makefile_in b/www/fennec/patches/patch-js_src_Makefile_in
new file mode 100644
index 00000000000..98aab59f010
--- /dev/null
+++ b/www/fennec/patches/patch-js_src_Makefile_in
@@ -0,0 +1,26 @@
+$OpenBSD: patch-js_src_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $: patch-js_src_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
+--- js/src/Makefile.in.orig	Thu Nov 17 19:43:54 2011
++++ js/src/Makefile.in	Thu Nov 17 19:47:41 2011
+@@ -438,6 +438,9 @@ else
+ ###############################################
+ # BEGIN include sources for the Nitro assembler
+ #
++
++ENABLE_YARR_JIT = 1
++
+ VPATH += 	$(srcdir)/assembler \
+ 		$(srcdir)/assembler/wtf \
+ 		$(srcdir)/assembler/jit \
+@@ -1081,7 +1084,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.
+-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
++
++ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
++CXXFLAGS +=  -DENABLE_JIT=1
++endif
+ 
+ INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
+ 
diff --git a/www/fennec/patches/patch-js_src_configure_in b/www/fennec/patches/patch-js_src_configure_in
index a892704e21a..c8f022390e2 100644
--- a/www/fennec/patches/patch-js_src_configure_in
+++ b/www/fennec/patches/patch-js_src_configure_in
@@ -1,11 +1,11 @@
-$OpenBSD: patch-js_src_configure_in,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-js_src_configure_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648721
 https://bugzilla.mozilla.org/show_bug.cgi?id=650742
 https://bugzilla.mozilla.org/show_bug.cgi?id=589754
---- js/src/configure.in.orig	Fri Aug 12 01:29:07 2011
-+++ js/src/configure.in	Tue Aug 23 22:46:50 2011
-@@ -2382,7 +2382,8 @@ ia64*-hpux*)
- 	;;
+--- js/src/configure.in.orig	Fri Nov  4 23:51:52 2011
++++ js/src/configure.in	Thu Nov 17 19:34:16 2011
+@@ -2440,7 +2440,8 @@ ia64*-hpux*)
+     ;;
  
  *-openbsd*)
 -    DLL_SUFFIX=".so.1.0"
@@ -14,7 +14,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
      DSO_CFLAGS=''
      DSO_PIC_CFLAGS='-fPIC'
      DSO_LDOPTS='-shared -fPIC'
-@@ -2734,7 +2735,7 @@ arm*-*)
+@@ -2763,7 +2764,7 @@ arm*-*)
      AC_DEFINE(JS_CPU_ARM)
      AC_DEFINE(JS_NUNBOX32)
      ;;
@@ -23,7 +23,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
      ENABLE_TRACEJIT=1
      NANOJIT_ARCH=Sparc
      ENABLE_METHODJIT=1
-@@ -2808,6 +2809,10 @@ arm*-*)
+@@ -2837,6 +2838,10 @@ arm*-*)
  sparc-*)
      AC_DEFINE(AVMPLUS_SPARC)
      ;;
@@ -34,7 +34,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=589754
  esac
  
  case "$target" in
-@@ -2822,6 +2827,9 @@ case "$target" in
+@@ -2851,6 +2856,9 @@ case "$target" in
      AC_DEFINE(AVMPLUS_UNIX)
      ;;
  *-freebsd*|*-kfreebsd*)
diff --git a/www/fennec/patches/patch-js_src_ctypes_libffi_configure b/www/fennec/patches/patch-js_src_ctypes_libffi_configure
index 21522dc10c2..43036be1f96 100644
--- a/www/fennec/patches/patch-js_src_ctypes_libffi_configure
+++ b/www/fennec/patches/patch-js_src_ctypes_libffi_configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.3 2011/06/28 22:01:18 landry Exp $
---- js/src/ctypes/libffi/configure.orig	Wed Aug 18 21:20:57 2010
-+++ js/src/ctypes/libffi/configure	Sat Sep  4 11:20:37 2010
+$OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.4 2011/12/08 01:35:08 nigel Exp $
+--- js/src/ctypes/libffi/configure.orig	Fri Nov  4 23:51:52 2011
++++ js/src/ctypes/libffi/configure	Thu Nov 17 19:34:16 2011
 @@ -11212,7 +11212,7 @@ case "$host" in
  	TARGET=FRV; TARGETDIR=frv
  	;;
@@ -19,12 +19,3 @@ $OpenBSD: patch-js_src_ctypes_libffi_configure,v 1.3 2011/06/28 22:01:18 landry
  	# Support 128-bit long double for NewABI.
  	HAVE_LONG_DOUBLE='defined(__mips64)'
  	TARGET=MIPS; TARGETDIR=mips
-@@ -11277,7 +11277,7 @@ case "$host" in
-   powerpc-*-aix* | rs6000-*-aix*)
- 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
- 	;;
--  powerpc-*-freebsd*)
-+  powerpc-*-freebsd* | powerpc-*-openbsd* )
- 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
- 	;;
-   powerpc*-*-rtems*)
diff --git a/www/fennec/patches/patch-js_src_xpconnect_src_Makefile_in b/www/fennec/patches/patch-js_src_xpconnect_src_Makefile_in
index ef6d8ed0220..40239bae996 100644
--- a/www/fennec/patches/patch-js_src_xpconnect_src_Makefile_in
+++ b/www/fennec/patches/patch-js_src_xpconnect_src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.4 2011/08/23 20:55:53 landry Exp $
---- js/src/xpconnect/src/Makefile.in.orig	Fri Aug 12 01:29:10 2011
-+++ js/src/xpconnect/src/Makefile.in	Tue Aug 23 22:47:23 2011
-@@ -203,6 +203,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
+$OpenBSD: patch-js_src_xpconnect_src_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
+--- js/src/xpconnect/src/Makefile.in.orig	Fri Nov  4 23:51:56 2011
++++ js/src/xpconnect/src/Makefile.in	Thu Nov 17 19:34:16 2011
+@@ -179,6 +179,7 @@ dom_quickstubs.cpp: $(srcdir)/dom_quickstubs.qsconf \
  	  --makedepend-output $(MDDEPDIR)/dom_qsgen.pp \
  	  $(ENABLE_TRACEABLE_FLAGS) \
  	  $(srcdir)/dom_quickstubs.qsconf
diff --git a/www/fennec/patches/patch-modules_libimg_png_pngerror_c b/www/fennec/patches/patch-modules_libimg_png_pngerror_c
deleted file mode 100644
index 97f4815f7a7..00000000000
--- a/www/fennec/patches/patch-modules_libimg_png_pngerror_c
+++ /dev/null
@@ -1,34 +0,0 @@
-$OpenBSD: patch-modules_libimg_png_pngerror_c,v 1.1 2011/07/30 07:55:53 landry Exp $
-Fix for CVE-2011-2691 backported from png 1.4.8
---- modules/libimg/png/pngerror.c.orig	Sun Jul 24 19:00:17 2011
-+++ modules/libimg/png/pngerror.c	Sun Jul 24 19:02:55 2011
-@@ -88,11 +88,11 @@ void PNGAPI
- png_err(png_structp png_ptr)
- {
-    if (png_ptr != NULL && png_ptr->error_fn != NULL)
--      (*(png_ptr->error_fn))(png_ptr, '\0');
-+      (*(png_ptr->error_fn))(png_ptr, "");
- 
-    /* If the custom handler doesn't exist, or if it returns,
-       use the default handler, which will not return. */
--   png_default_error(png_ptr, '\0');
-+   png_default_error(png_ptr, "");
- }
- #endif /* PNG_ERROR_TEXT_SUPPORTED */
- 
-@@ -181,8 +181,13 @@ png_format_buffer(png_structp png_ptr, png_charp buffe
-    {
-       buffer[iout++] = ':';
-       buffer[iout++] = ' ';
--      png_memcpy(buffer + iout, error_message, PNG_MAX_ERROR_TEXT);
--      buffer[iout + PNG_MAX_ERROR_TEXT - 1] = '\0';
-+
-+      iin = 0;
-+      while (iin < PNG_MAX_ERROR_TEXT-1 && error_message[iin] != '\0')
-+         buffer[iout++] = error_message[iin++];
-+
-+      /* iin < PNG_MAX_ERROR_TEXT, so the following is safe: */
-+      buffer[iout] = '\0';
-    }
- }
- 
diff --git a/www/fennec/patches/patch-parser_html_Makefile_in b/www/fennec/patches/patch-parser_html_Makefile_in
index 2f44d72a7f5..3f161611feb 100644
--- a/www/fennec/patches/patch-parser_html_Makefile_in
+++ b/www/fennec/patches/patch-parser_html_Makefile_in
@@ -1,13 +1,14 @@
-$OpenBSD: patch-parser_html_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
+$OpenBSD: patch-parser_html_Makefile_in,v 1.4 2011/12/08 01:35:08 nigel Exp $
 
 gcc runs out of memory with optimization.
 
---- parser/html/Makefile.in.orig	Wed Dec 15 02:03:34 2010
-+++ parser/html/Makefile.in	Wed Dec 22 22:33:03 2010
-@@ -98,3 +98,6 @@ include $(topsrcdir)/config/rules.mk
- INCLUDES	+= \
+--- parser/html/Makefile.in.orig	Fri Nov  4 23:52:06 2011
++++ parser/html/Makefile.in	Thu Nov 17 19:34:16 2011
+@@ -113,4 +113,7 @@ INCLUDES	+= \
  		-I$(srcdir)/../../content/base/src \
  		$(NULL)
-+
+ 
 +nsHtml5NamedCharacters.o: CXXFLAGS := $(filter-out -O%,$(CXXFLAGS))
 +nsHtml5ElementName.o: CXXFLAGS := $(CXXFLAGS) -O1
++
+ #DEFINES		+= -DENABLE_VOID_MENUITEM
diff --git a/www/fennec/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp b/www/fennec/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
index 2f00bb87e26..6c47f3fe20b 100644
--- a/www/fennec/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
+++ b/www/fennec/patches/patch-security_manager_ssl_src_nsNSSComponent_cpp
@@ -1,7 +1,7 @@
-$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2011/08/23 20:55:53 landry Exp $
---- security/manager/ssl/src/nsNSSComponent.cpp.orig	Fri Aug 12 01:29:20 2011
-+++ security/manager/ssl/src/nsNSSComponent.cpp	Tue Aug 23 22:46:56 2011
-@@ -821,11 +821,10 @@ nsNSSComponent::InstallLoadableRoots()
+$OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.5 2011/12/08 01:35:08 nigel Exp $
+--- security/manager/ssl/src/nsNSSComponent.cpp.orig	Fri Nov  4 23:52:07 2011
++++ security/manager/ssl/src/nsNSSComponent.cpp	Thu Nov 17 19:34:16 2011
+@@ -847,11 +847,10 @@ nsNSSComponent::InstallLoadableRoots()
      return;
  
    const char *possible_ckbi_locations[] = {
@@ -16,7 +16,7 @@ $OpenBSD: patch-security_manager_ssl_src_nsNSSComponent_cpp,v 1.4 2011/08/23 20:
    };
  
    for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
-@@ -834,7 +833,7 @@ nsNSSComponent::InstallLoadableRoots()
+@@ -860,7 +859,7 @@ nsNSSComponent::InstallLoadableRoots()
  
      if (!possible_ckbi_locations[il])
      {
diff --git a/www/fennec/patches/patch-storage_src_mozStorageConnection_cpp b/www/fennec/patches/patch-storage_src_mozStorageConnection_cpp
index 2a3a8f51a0f..95e89786898 100644
--- a/www/fennec/patches/patch-storage_src_mozStorageConnection_cpp
+++ b/www/fennec/patches/patch-storage_src_mozStorageConnection_cpp
@@ -1,9 +1,9 @@
-$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-storage_src_mozStorageConnection_cpp,v 1.5 2011/12/08 01:35:08 nigel Exp $
 set secure_delete PRAGMA on by default, instead of using internal sqlite copy
 https://bugzilla.mozilla.org/show_bug.cgi?id=546162
---- storage/src/mozStorageConnection.cpp.orig	Fri Aug 12 01:29:23 2011
-+++ storage/src/mozStorageConnection.cpp	Tue Aug 23 22:46:56 2011
-@@ -555,6 +555,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
+--- storage/src/mozStorageConnection.cpp.orig	Fri Nov  4 23:52:08 2011
++++ storage/src/mozStorageConnection.cpp	Thu Nov 17 19:34:16 2011
+@@ -591,6 +591,13 @@ Connection::initialize(nsIFile *aDatabaseFile,
      return convertResultCode(srv);
    }
  
diff --git a/www/fennec/patches/patch-toolkit_library_Makefile_in b/www/fennec/patches/patch-toolkit_library_Makefile_in
index d9ffcec2b1a..7f9c7121c65 100644
--- a/www/fennec/patches/patch-toolkit_library_Makefile_in
+++ b/www/fennec/patches/patch-toolkit_library_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_library_Makefile_in,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-toolkit_library_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
 https://bugzilla.mozilla.org/show_bug.cgi?id=648730
---- toolkit/library/Makefile.in.orig	Fri Jul 22 00:18:55 2011
-+++ toolkit/library/Makefile.in	Sun Jul 31 19:42:21 2011
+--- toolkit/library/Makefile.in.orig	Fri Nov  4 23:52:10 2011
++++ toolkit/library/Makefile.in	Thu Nov 17 19:40:27 2011
 @@ -157,6 +157,12 @@ OS_LIBS += \
  	$(NULL)
  endif
@@ -16,14 +16,14 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=648730
  ifeq ($(OS_ARCH),Darwin)
  ifdef MOZ_SYDNEYAUDIO
  EXTRA_DSO_LDOPTS += \
-@@ -165,12 +171,6 @@ EXTRA_DSO_LDOPTS += \
- 	-framework AudioToolbox \
- 	-framework AudioUnit \
+@@ -168,12 +174,6 @@ EXTRA_DSO_LDOPTS += \
+ 	-framework Foundation \
+ 	-framework AppKit \
  	$(NULL)
 -endif
 -endif
 -
--ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+-ifneq (,$(filter NetBSD OpenBSD,$(OS_ARCH)))
 -ifdef MOZ_SYDNEYAUDIO
 -EXTRA_DSO_LDOPTS += -lossaudio
  endif
diff --git a/www/fennec/patches/patch-toolkit_library_libxul-config_mk b/www/fennec/patches/patch-toolkit_library_libxul-config_mk
index 47aab24d406..937c57f721b 100644
--- a/www/fennec/patches/patch-toolkit_library_libxul-config_mk
+++ b/www/fennec/patches/patch-toolkit_library_libxul-config_mk
@@ -1,11 +1,11 @@
-$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.5 2011/12/08 01:35:08 nigel Exp $
 Ensure systemwide nss is taken
 Ensure local libjs is taken (build failure when spidermonkey is installed,
 its libjs_static.a is found first in lib search path)
 https://bugzilla.mozilla.org/show_bug.cgi?id=646375
---- toolkit/library/libxul-config.mk.orig	Fri Aug 12 01:29:25 2011
-+++ toolkit/library/libxul-config.mk	Tue Aug 23 22:46:56 2011
-@@ -331,13 +331,14 @@ EXTRA_DSO_LDOPTS += \
+--- toolkit/library/libxul-config.mk.orig	Fri Nov  4 23:52:10 2011
++++ toolkit/library/libxul-config.mk	Thu Nov 17 19:40:27 2011
+@@ -320,14 +320,15 @@ EXTRA_DSO_LDOPTS += \
  	$(JPEG_LIBS) \
  	$(PNG_LIBS) \
  	$(QCMS_LIBS) \
@@ -16,6 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=646375
  	$(MOZ_HARFBUZZ_LIBS) \
  	$(MOZ_OTS_LIBS) \
  	$(MOZ_APP_EXTRA_LIBS) \
+ 	$(SQLITE_LIBS) \
  	$(NULL)
 +
 +OS_LIBS	+= $(NSS_LIBS)
diff --git a/www/fennec/patches/patch-toolkit_mozapps_installer_packager_mk b/www/fennec/patches/patch-toolkit_mozapps_installer_packager_mk
index 66ca9620114..0f5acd2f5d3 100644
--- a/www/fennec/patches/patch-toolkit_mozapps_installer_packager_mk
+++ b/www/fennec/patches/patch-toolkit_mozapps_installer_packager_mk
@@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-toolkit_mozapps_installer_packager_mk,v 1.5 2011/12/08 01:35:08 nigel Exp $
 install headers/idl/sdk libs only if xulrunner
---- toolkit/mozapps/installer/packager.mk.orig	Fri Aug 12 01:29:25 2011
-+++ toolkit/mozapps/installer/packager.mk	Tue Aug 23 22:46:57 2011
-@@ -704,7 +704,7 @@ endif
+--- toolkit/mozapps/installer/packager.mk.orig	Fri Nov  4 23:52:10 2011
++++ toolkit/mozapps/installer/packager.mk	Thu Nov 17 19:34:16 2011
+@@ -759,7 +759,7 @@ endif
  	$(NSINSTALL) -D $(DESTDIR)$(bindir)
  	$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
  	ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
diff --git a/www/fennec/patches/patch-toolkit_xre_nsXREDirProvider_cpp b/www/fennec/patches/patch-toolkit_xre_nsXREDirProvider_cpp
index 9fdf619e99b..93e8ced41c5 100644
--- a/www/fennec/patches/patch-toolkit_xre_nsXREDirProvider_cpp
+++ b/www/fennec/patches/patch-toolkit_xre_nsXREDirProvider_cpp
@@ -1,8 +1,8 @@
-$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-toolkit_xre_nsXREDirProvider_cpp,v 1.5 2011/12/08 01:35:08 nigel Exp $
 Look for extensions in LOCALBASE
---- toolkit/xre/nsXREDirProvider.cpp.orig	Fri Aug 12 01:29:27 2011
-+++ toolkit/xre/nsXREDirProvider.cpp	Tue Aug 23 22:46:57 2011
-@@ -1122,11 +1122,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
+--- toolkit/xre/nsXREDirProvider.cpp.orig	Fri Nov  4 23:52:11 2011
++++ toolkit/xre/nsXREDirProvider.cpp	Thu Nov 17 19:34:16 2011
+@@ -1116,11 +1116,7 @@ nsXREDirProvider::GetSystemExtensionsDirectory(nsILoca
    NS_ENSURE_SUCCESS(rv, rv);
  #elif defined(XP_UNIX)
    static const char *const sysSExtDir = 
diff --git a/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in b/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
index 5c3e020b856..aa844eeca31 100644
--- a/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
+++ b/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.3 2011/06/28 22:01:18 landry Exp $
+$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2011/12/08 01:35:08 nigel Exp $
 chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Fri May 27 18:13:00 2011
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Tue May 31 22:18:41 2011
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Fri Nov  4 23:52:12 2011
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Thu Nov 17 19:34:16 2011
 @@ -219,7 +219,7 @@ endif
  #
  # OpenBSD/ARM
@@ -11,11 +11,3 @@ chunk 2: https://bugzilla.mozilla.org/show_bug.cgi?id=650749
  CPPSRCS		:= xptcinvoke_arm_openbsd.cpp xptcstubs_arm_openbsd.cpp
  endif
  
-@@ -370,6 +370,7 @@ endif
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDpowerpc)
- CPPSRCS		:= xptcinvoke_ppc_openbsd.cpp xptcstubs_ppc_openbsd.cpp
- ASFILES		:= xptcinvoke_asm_ppc_openbsd.s xptcstubs_asm_ppc_openbsd.s
-+AS		:= $(CC) -c -x assembler-with-cpp
- endif
- 
- #
diff --git a/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s b/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
deleted file mode 100644
index 108e0099e1e..00000000000
--- a/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s
+++ /dev/null
@@ -1,228 +0,0 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcinvoke_asm_ppc_openbsd_s,v 1.3 2011/06/28 22:01:18 landry Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=650749
---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s.orig	Sun Dec 23 01:57:11 2007
-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.s	Sun Sep 14 22:24:42 2008
-@@ -1,43 +1,43 @@
--# -*- Mode: Asm -*-
--#
--# ***** BEGIN LICENSE BLOCK *****
--# Version: MPL 1.1/GPL 2.0/LGPL 2.1
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License. You may obtain a copy of the License at
--# http:#www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is
--# Netscape Communications Corporation.
--# Portions created by the Initial Developer are Copyright (C) 1999
--# the Initial Developer. All Rights Reserved.
--#
--# Contributor(s):
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 2 or later (the "GPL"), or
--# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--# in which case the provisions of the GPL or the LGPL are applicable instead
--# of those above. If you wish to allow use of your version of this file only
--# under the terms of either the GPL or the LGPL, and not to allow others to
--# use your version of this file under the terms of the MPL, indicate your
--# decision by deleting the provisions above and replace them with the notice
--# and other provisions required by the GPL or the LGPL. If you do not delete
--# the provisions above, a recipient may use your version of this file under
--# the terms of any one of the MPL, the GPL or the LGPL.
--#
--# ***** END LICENSE BLOCK *****
-+// -*- Mode: Asm -*-
-+//
-+// ***** BEGIN LICENSE BLOCK *****
-+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+//
-+// The contents of this file are subject to the Mozilla Public License Version
-+// 1.1 (the "License"); you may not use this file except in compliance with
-+// the License. You may obtain a copy of the License at
-+// http://www.mozilla.org/MPL/
-+//
-+// Software distributed under the License is distributed on an "AS IS" basis,
-+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+// for the specific language governing rights and limitations under the
-+// License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is
-+// Netscape Communications Corporation.
-+// Portions created by the Initial Developer are Copyright (C) 1999
-+// the Initial Developer. All Rights Reserved.
-+//
-+// Contributor(s):
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
-+// Alternatively, the contents of this file may be used under the terms of
-+// either the GNU General Public License Version 2 or later (the "GPL"), or
-+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+// in which case the provisions of the GPL or the LGPL are applicable instead
-+// of those above. If you wish to allow use of your version of this file only
-+// under the terms of either the GPL or the LGPL, and not to allow others to
-+// use your version of this file under the terms of the MPL, indicate your
-+// decision by deleting the provisions above and replace them with the notice
-+// and other provisions required by the GPL or the LGPL. If you do not delete
-+// the provisions above, a recipient may use your version of this file under
-+// the terms of any one of the MPL, the GPL or the LGPL.
-+//
-+// ***** END LICENSE BLOCK *****
- 
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -53,80 +53,80 @@
- .set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
- .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
- .set f30,30; .set f31,31
--		      
--        .section ".text"
-+
-+	.section ".text"
- 	.align 2
- 	.globl NS_InvokeByIndex_P
- 	.type  NS_InvokeByIndex_P,@function
- 
--#
--# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
--#                  PRUint32 paramCount, nsXPTCVariant* params)
--#
-+//
-+// NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
-+//                    PRUint32 paramCount, nsXPTCVariant* params)
-+//
- 
- NS_InvokeByIndex_P:
--	stwu    sp,-32(sp)			# setup standard stack frame
--	mflr    r0				# save LR
--	stw     r3,8(sp)			# r3 <= that
--	stw     r4,12(sp)			# r4 <= methodIndex
--	stw     r30,16(sp)
--	stw     r31,20(sp)
-+	stwu	sp,-32(sp)			// setup standard stack frame
-+	mflr	r0				// save LR
-+	stw	r3,8(sp)			// r3 <= that
-+	stw	r4,12(sp)			// r4 <= methodIndex
-+	stw	r30,16(sp)
-+	stw	r31,20(sp)
- 
--	stw     r0,36(sp)			# store LR backchain
--	mr      r31,sp
-+	stw	r0,36(sp)			// store LR backchain
-+	mr	r31,sp
- 
--	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
--	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
--	lwz     r9,0(sp)			# r9 = backchain
--	neg     r0,r0
--	stwux   r9,sp,r0			# reserve stack space and save SP backchain
-+	rlwinm	r10,r5,3,0,27			// r10 = (ParamCount * 2 * 4) & ~0x0f
-+	addi	r0,r10,96			// reserve stack for GPR and FPR register save area r0 = r10 + 96
-+	lwz	r9,0(sp)			// r9 = backchain
-+	neg	r0,r0
-+	stwux	r9,sp,r0			// reserve stack space and save SP backchain
- 
--	addi    r3,sp,8				# r3 <= args
--	mr      r4,r5				# r4 <= paramCount
--	mr      r5,r6				# r5 <= params
--	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
--	mr      r30,r6				# store in r30 for use later...
--	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
-+	addi	r3,sp,8				// r3 <= args
-+	mr	r4,r5				// r4 <= paramCount
-+	mr	r5,r6				// r5 <= params
-+	add	r6,r3,r10			// r6 <= gpregs ( == args + r10 )
-+	mr	r30,r6				// store in r30 for use later...
-+	addi	r7,r6,32			// r7 <= fpregs ( == gpregs + 32 )
- 
--	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
-+	bl	invoke_copy_to_stack@local	// (args, paramCount, params, gpregs, fpregs)
- 
--	lfd     f1,32(r30)			# load FP registers with method parameters
--	lfd     f2,40(r30)   
--	lfd     f3,48(r30)  
--	lfd     f4,56(r30)  
--	lfd     f5,64(r30)  
--	lfd     f6,72(r30)  
--	lfd     f7,80(r30)  
--	lfd     f8,88(r30)
-+	lfd	f1,32(r30)			// load FP registers with method parameters
-+	lfd	f2,40(r30)
-+	lfd	f3,48(r30)
-+	lfd	f4,56(r30)
-+	lfd	f5,64(r30)
-+	lfd	f6,72(r30)
-+	lfd	f7,80(r30)
-+	lfd	f8,88(r30)
- 
--	lwz     r3,8(r31)			# r3 <= that
--	lwz     r4,12(r31)			# r4 <= methodIndex
--	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
--#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION  >= 100) # G++ pre-V3 ABI
--	addi	r4,r4,2				# skip first two vtable entries
-+	lwz	r3,8(r31)			// r3 <= that
-+	lwz	r4,12(r31)			// r4 <= methodIndex
-+	lwz	r5,0(r3)			// r5 <= vtable ( == *that )
-+#if !((__GNUC__ == 3 && __GNUC_MINOR__ < 2) || __GXX_ABI_VERSION >= 100) // G++ pre-V3 ABI
-+	addi	r4,r4,2				// skip first two vtable entries
- #endif
--	slwi    r4,r4,2				# convert to offset ( *= 4 )
--	lwzx    r0,r5,r4			# r0 <= methodpointer ( == vtable + offset )
-+	slwi	r4,r4,2				// convert to offset ( *= 4 )
-+	lwzx	r0,r5,r4			// r0 <= methodpointer ( == vtable + offset )
- 
--        lwz     r4,4(r30)			# load GP regs with method parameters
--	lwz     r5,8(r30)
--	lwz     r6,12(r30)
--	lwz     r7,16(r30)
--	lwz     r8,20(r30)
--	lwz     r9,24(r30)
--	lwz     r10,28(r30)
-+	lwz	r4,4(r30)			// load GP regs with method parameters
-+	lwz	r5,8(r30)
-+	lwz	r6,12(r30)
-+	lwz	r7,16(r30)
-+	lwz	r8,20(r30)
-+	lwz	r9,24(r30)
-+	lwz	r10,28(r30)
- 
--	mtlr    r0				# copy methodpointer to LR
--	blrl					# call method
--	
--	lwz     r30,16(r31)			# restore r30 & r31
--	lwz     r31,20(r31)
--	
--	lwz     r11,0(sp)			# clean up the stack
--	lwz     r0,4(r11)
--	mtlr    r0
--	mr      sp,r11
-+	mtlr	r0				// copy methodpointer to LR
-+	blrl					// call method
-+
-+	lwz	r30,16(r31)			// restore r30 & r31
-+	lwz	r31,20(r31)
-+
-+	lwz	r11,0(sp)			// clean up the stack
-+	lwz	r0,4(r11)
-+	mtlr	r0
-+	mr	sp,r11
- 	blr
- 
--# Magic indicating no need for an executable stack
-+// Magic indicating no need for an executable stack
- .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s b/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
deleted file mode 100644
index f3c8561aa25..00000000000
--- a/www/fennec/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s
+++ /dev/null
@@ -1,171 +0,0 @@
-$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptcstubs_asm_ppc_openbsd_s,v 1.3 2011/06/28 22:01:18 landry Exp $
-https://bugzilla.mozilla.org/show_bug.cgi?id=650749
---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s.orig	Sun Dec 23 01:57:11 2007
-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.s	Sun Sep 14 22:21:55 2008
-@@ -1,43 +1,43 @@
--# -*- Mode: Asm -*-
--#
--# ***** BEGIN LICENSE BLOCK *****
--# Version: MPL 1.1/GPL 2.0/LGPL 2.1
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License. You may obtain a copy of the License at
--# http:#www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# The Original Code is mozilla.org code.
--#
--# The Initial Developer of the Original Code is
--# Netscape Communications Corporation.
--# Portions created by the Initial Developer are Copyright (C) 1999
--# the Initial Developer. All Rights Reserved.
--#
--# Contributor(s):
--#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
--#   beard@netscape.com (Patrick Beard)
--#   waterson@netscape.com (Chris Waterson)
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 2 or later (the "GPL"), or
--# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
--# in which case the provisions of the GPL or the LGPL are applicable instead
--# of those above. If you wish to allow use of your version of this file only
--# under the terms of either the GPL or the LGPL, and not to allow others to
--# use your version of this file under the terms of the MPL, indicate your
--# decision by deleting the provisions above and replace them with the notice
--# and other provisions required by the GPL or the LGPL. If you do not delete
--# the provisions above, a recipient may use your version of this file under
--# the terms of any one of the MPL, the GPL or the LGPL.
--#
--# ***** END LICENSE BLOCK *****
-+// -*- Mode: Asm -*-
-+//
-+// ***** BEGIN LICENSE BLOCK *****
-+// Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+//
-+// The contents of this file are subject to the Mozilla Public License Version
-+// 1.1 (the "License"); you may not use this file except in compliance with
-+// the License. You may obtain a copy of the License at
-+// http://www.mozilla.org/MPL/
-+//
-+// Software distributed under the License is distributed on an "AS IS" basis,
-+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+// for the specific language governing rights and limitations under the
-+// License.
-+//
-+// The Original Code is mozilla.org code.
-+//
-+// The Initial Developer of the Original Code is
-+// Netscape Communications Corporation.
-+// Portions created by the Initial Developer are Copyright (C) 1999
-+// the Initial Developer. All Rights Reserved.
-+//
-+// Contributor(s):
-+//   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
-+//   beard@netscape.com (Patrick Beard)
-+//   waterson@netscape.com (Chris Waterson)
-+//
-+// Alternatively, the contents of this file may be used under the terms of
-+// either the GNU General Public License Version 2 or later (the "GPL"), or
-+// the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+// in which case the provisions of the GPL or the LGPL are applicable instead
-+// of those above. If you wish to allow use of your version of this file only
-+// under the terms of either the GPL or the LGPL, and not to allow others to
-+// use your version of this file under the terms of the MPL, indicate your
-+// decision by deleting the provisions above and replace them with the notice
-+// and other provisions required by the GPL or the LGPL. If you do not delete
-+// the provisions above, a recipient may use your version of this file under
-+// the terms of any one of the MPL, the GPL or the LGPL.
-+//
-+// ***** END LICENSE BLOCK *****
- 
- .set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
- .set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
-@@ -54,29 +54,29 @@
- .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
- .set f30,30; .set f31,31
- 
--        .section ".text"
--        .align 2
-+	.section ".text"
-+	.align 2
- 	.globl SharedStub
- 	.type  SharedStub,@function
- 
- SharedStub:
--        stwu	sp,-112(sp)			# room for 
--						# linkage (8),
--						# gprData (32),
--						# fprData (64), 
--						# stack alignment(8)
--        mflr	r0
--	stw	r0,116(sp)			# save LR backchain
-+	stwu	sp,-112(sp)			// room for
-+						// linkage (8),
-+						// gprData (32),
-+						// fprData (64),
-+						// stack alignment(8)
-+	mflr	r0
-+	stw	r0,116(sp)			// save LR backchain
- 
--	stw	r4,12(sp)			# save GP registers
--	stw	r5,16(sp)			# (n.b. that we don't save r3
--	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
-+	stw	r4,12(sp)			// save GP registers
-+	stw	r5,16(sp)			// (n.b. that we don't save r3
-+	stw	r6,20(sp)			// because PrepareAndDispatch() is savvy)
- 	stw	r7,24(sp)
- 	stw	r8,28(sp)
- 	stw	r9,32(sp)
- 	stw	r10,36(sp)
- 
--	stfd	f1,40(sp)			# save FP registers
-+	stfd	f1,40(sp)			// save FP registers
- 	stfd	f2,48(sp)
- 	stfd	f3,56(sp)
- 	stfd	f4,64(sp)
-@@ -85,23 +85,23 @@ SharedStub:
- 	stfd	f7,88(sp)
- 	stfd	f8,96(sp)
- 
--						# r3 has the 'self' pointer already
--	
--	mr      r4,r11				# r4 <= methodIndex selector, passed
--						# via r11 in the nsXPTCStubBase::StubXX() call
--	
--	addi	r5,sp,120			# r5 <= pointer to callers args area,
--						# beyond r3-r10/f1-f8 mapped range
--	
--	addi	r6,sp,8				# r6 <= gprData
--	addi	r7,sp,40			# r7 <= fprData
--      
--	bl	PrepareAndDispatch@local	# Go!
--    
--	lwz	r0,116(sp)			# restore LR
-+						// r3 has the 'self' pointer already
-+
-+	mr	r4,r11				// r4 <= methodIndex selector, passed
-+						// via r11 in the nsXPTCStubBase::StubXX() call
-+
-+	addi	r5,sp,120			// r5 <= pointer to callers args area,
-+						// beyond r3-r10/f1-f8 mapped range
-+
-+	addi	r6,sp,8				// r6 <= gprData
-+	addi	r7,sp,40			// r7 <= fprData
-+
-+	bl	PrepareAndDispatch@local	// Go!
-+
-+	lwz	r0,116(sp)			// restore LR
- 	mtlr	r0
--	la	sp,112(sp)			# clean up the stack
-+	la	sp,112(sp)			// clean up the stack
- 	blr
- 
--# Magic indicating no need for an executable stack
-+// Magic indicating no need for an executable stack
- .section .note.GNU-stack, "", @progbits ; .previous
diff --git a/www/fennec/patches/patch-xulrunner_app_Makefile_in b/www/fennec/patches/patch-xulrunner_app_Makefile_in
index 64de49ae3b0..d92365234dc 100644
--- a/www/fennec/patches/patch-xulrunner_app_Makefile_in
+++ b/www/fennec/patches/patch-xulrunner_app_Makefile_in
@@ -1,8 +1,8 @@
-$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.4 2011/08/23 20:55:53 landry Exp $
+$OpenBSD: patch-xulrunner_app_Makefile_in,v 1.5 2011/12/08 01:35:08 nigel Exp $
 https://bugzilla.mozilla.org/show_bug.cgi?id=648726
---- xulrunner/app/Makefile.in.orig	Fri Aug 12 01:29:29 2011
-+++ xulrunner/app/Makefile.in	Tue Aug 23 22:47:24 2011
-@@ -79,6 +79,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+--- xulrunner/app/Makefile.in.orig	Fri Nov  4 23:52:12 2011
++++ xulrunner/app/Makefile.in	Thu Nov 17 19:34:16 2011
+@@ -80,6 +80,12 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
  TK_LIBS := -framework Cocoa $(TK_LIBS)
  endif
  
diff --git a/www/fennec/pkg/PLIST b/www/fennec/pkg/PLIST
index 326a854b4fc..d2f49018f67 100644
--- a/www/fennec/pkg/PLIST
+++ b/www/fennec/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/10/03 21:08:12 landry Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/12/08 01:35:08 nigel Exp $
 bin/${MOZILLA_PROJECT}
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
@@ -34,7 +34,9 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/PlacesCategoriesStarter.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/PromptService.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/SessionStore.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/Sidebar.js
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/TelemetryPing.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/Weave.js
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/WebappsSupport.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/XPIDialogService.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/addonManager.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/amContentHandler.js
@@ -95,7 +97,38 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}_icon.png
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/greprefs.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_af.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_bg.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ca.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_cy.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_da.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-1901.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-1996.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_de-CH.dic
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_en_US.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_eo.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_es.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_et.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fi.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_fr.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_gl.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hr.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_hsb.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ia.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_is.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_kmr.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_la.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_lt.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_mn.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nb.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nl.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_nn.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_pt.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_ru.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sh.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sl.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_sv.dic
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/hyphenation/hyph_uk.dic
 @lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
 @lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
 @lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}
@@ -120,6 +153,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/LightweightThemeManager.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/LocaleRepository.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/Microformats.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/NetUtil.jsm
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PageMenu.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PerfMeasurement.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PlacesDBUtils.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PlacesUtils.jsm
@@ -127,7 +161,6 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PluginProvider.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PluralForm.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/PopupNotifications.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/Services.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/SpatialNavigation.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/WindowDraggingUtils.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/XPCOMUtils.jsm
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/XPIProvider.jsm
@@ -163,6 +196,7 @@ lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/notifications.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/policies.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/record.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/resource.js
+lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/rest.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/service.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/status.js
 lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/modules/services-sync/util.js