diff --git a/mozilla/browser/app/Makefile.in b/mozilla/browser/app/Makefile.in
index 487a59f6a45..cbfcbbe39be 100644
--- a/mozilla/browser/app/Makefile.in
+++ b/mozilla/browser/app/Makefile.in
@@ -226,7 +226,6 @@ endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
-LIBS	+= -framework QuickTime -framework IOKit -lcrypto
 ifdef USE_PREBINDING
 BIN_FLAGS += -Wl,-headerpad -Wl,5a0c
 endif
diff --git a/mozilla/config/static-rules.mk b/mozilla/config/static-rules.mk
index af56e017353..693bd7d4a8b 100644
--- a/mozilla/config/static-rules.mk
+++ b/mozilla/config/static-rules.mk
@@ -19,3 +19,7 @@ GARBAGE += nsStaticComponents.cpp
 ifeq ($(OS_ARCH),IRIX)
 LDFLAGS	+= -Wl,-LD_LAYOUT:lgot_buffer=80
 endif
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+LIBS	+= -framework QuickTime -framework IOKit -lcrypto
+endif
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 94b696ace1d..5762c8feeff 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -5531,7 +5531,8 @@ dnl ========================================================
 dnl = Airbag crash reporting (on by default on supported platforms)
 dnl ========================================================
 
-if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC"; then
+if test "$OS_ARCH" = "WINNT" -a -z "$GNU_CC" \
+  || test "$OS_ARCH" = "Darwin"; then
    MOZ_AIRBAG=1
 fi
 
diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index f2c0cb84cac..75b0aec7502 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -181,7 +181,7 @@ DEFINES += -DAPP_VERSION="$(APP_VERSION)"
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
-LIBS	+= -framework QuickTime -framework IOKit -lcups
+LIBS	+= -lcups
 endif
 endif