diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 382c6eda642..388c466ef16 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -455,6 +455,14 @@ FORCE_STATIC_LIB=1
 _ENABLE_PIC=1
 endif
 
+#
+# Force PIC if we're generating the mozcomps meta module
+#
+
+ifneq (,$(findstring mozcomps, $(MOZ_META_COMPONENTS)))
+_ENABLE_PIC=1
+endif
+
 #
 # Disable PIC if necessary
 #
diff --git a/mozilla/modules/staticmod/Makefile.in b/mozilla/modules/staticmod/Makefile.in
index 33cdb49749b..e12daf862c6 100644
--- a/mozilla/modules/staticmod/Makefile.in
+++ b/mozilla/modules/staticmod/Makefile.in
@@ -123,6 +123,7 @@ EXTRA_DSO_LDOPTS += \
 	$(call EXPAND_MOZLIBNAME,xpcom_compat gkgfx rdfutil_s) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
+	$(TK_LIBS) \
 	$(NULL)
 endif # meta_mail
 
@@ -144,13 +145,22 @@ endif
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
-	$(STATIC_EXTRA_DSO_LIBS) \
+	$(EXTRA_DSO_LIBS) \
 	$(STATIC_EXTRA_LIBS) \
 	$(MOZ_JS_LIBS) \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)
+	
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+OS_LIBS	+= -framework QuickTime
+endif
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+OS_LIBS	+= -framework Cocoa
+endif
+
 endif # meta_mozcomps
 
 endif # MOZ_META_COMPONENTS