diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index 0b70fef..05c17aa 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -103,6 +103,7 @@ else
 STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
 endif
 LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
+OS_LIBS += -framework SystemConfiguration -framework OpenGL
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 LIBS += $(DIST)/bin/XUL
@@ -111,6 +112,15 @@ EXTRA_DSO_LIBS += xul
 endif
 endif
 
+ifdef BUILD_STATIC_LIBS
+MOZ_JS_LIBS		   = -L$(DIST)/lib -ljs_static
+NSPR_LIBS = \
+  $(DIST)/lib/libplds4.a \
+  $(DIST)/lib/libplc4.a \
+  $(DIST)/lib/libnspr4.a \
+  $(NULL)
+endif
+
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 TK_LIBS := $(TK_LIBS)
 endif
@@ -178,6 +188,7 @@ DEFINES		+= $(STATIC_DEFINES)
 CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
+EXTRA_LIBS += ../../media/liboggz/src/liboggz/liboggz.a 
 endif
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 56f2986..b421268 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -41,7 +41,7 @@ MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
 MOZ_ENABLE_LIBXUL=1
-MOZ_STATIC_BUILD_UNSUPPORTED=1
+#MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_PLACES=1
 # always enabled for form history
 MOZ_MORKREADER=1
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 4898815..c2fe964 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -59,16 +59,7 @@ include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
-ifdef MOZ_ENABLE_LIBXUL
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
-else
-define message
-You need to build with --enable-libxul (the default, unless you specify
---disable-libxul or --enable-shared or --enable-debug) to package a build.
-endef
-default libs installer::
-	$(error $(message))
-endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 669b3dc..e8ac738 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -44,6 +44,9 @@
 @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
+#ifdef MOZ_STATIC_BUILD
+@BINPATH@/@DLL_PREFIX@xpcom_core@DLL_SUFFIX@
+#endif
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
 #ifdef XP_MACOSX
 @BINPATH@/XUL
@@ -87,7 +90,9 @@
 #elifdef XP_OS2
 @BINPATH@/plugins/npnulos2.dll
 #endif
+#ifndef MOZ_STATIC_BUILD
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
+#endif
 @BINPATH@/README.txt
 @BINPATH@/LICENSE
 @BINPATH@/blocklist.xml
diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in
index ab01962..1bcf80a 100644
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -47,7 +47,12 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE           = sqlite3
 LIBRARY_NAME     = mozsqlite3
+ifdef BUILD_STATIC_LIBS
+FORCE_STATIC_LIB = 1
+DIST_INSTALL = 1
+else
 FORCE_SHARED_LIB = 1
+endif
 VISIBILITY_FLAGS =
 LIB_IS_C_ONLY    = 1
 
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index d469015..d449c4c 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -75,6 +75,8 @@ LIBRARY_NAME	    = mozjs
 STATIC_LIBRARY_NAME = js_static
 GRE_MODULE	    = 1
 
+DIST_INSTALL = 1
+
 LIBS		= $(NSPR_LIBS) 
 
 ifdef GNU_CXX
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index ab3904b..ee44fa7 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -50,7 +50,13 @@ include $(topsrcdir)/intl/unicharutil/util/objs.mk
 MODULE = libxul
 LIBRARY_NAME = xul
 FORCE_USE_PIC = 1
+ifdef BUILD_STATIC_LIBS
+FORCE_SHARED_LIB = 0
+FORCE_STATIC_LIB = 1
+else
 FORCE_SHARED_LIB = 1
+FORCE_STATIC_LIB = 0
+endif
 MOZILLA_INTERNAL_API = 1
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
@@ -60,7 +66,7 @@ LIBRARY_NAME=XUL
 # Setting MAKE_FRAMEWORK makes DLL_PREFIX and DLL_SUFFIX be ignored when
 # setting SHARED_LIBRARY; we need to leave DLL_PREFIX and DLL_SUFFIX
 # as-is so that dependencies of the form -ltracemalloc still work.
-MAKE_FRAMEWORK=1
+MAKE_FRAMEWORK=0
 endif