diff --git a/mozilla/toolkit/crashreporter/Makefile.in b/mozilla/toolkit/crashreporter/Makefile.in
index 48dacb3ffe8..3a54821994f 100644
--- a/mozilla/toolkit/crashreporter/Makefile.in
+++ b/mozilla/toolkit/crashreporter/Makefile.in
@@ -64,6 +64,7 @@ ifeq ($(OS_ARCH),Darwin)
 DIRS += \
   airbag/src/common \
   airbag/src/common/mac \
+  airbag/src/client \
   airbag/src/client/mac/handler \
   airbag/src/tools/mac/dump_syms \
   $(NULL)
diff --git a/mozilla/toolkit/crashreporter/google-breakpad/src/client/Makefile.in b/mozilla/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
new file mode 100644
index 00000000000..f07d7ca9aad
--- /dev/null
+++ b/mozilla/toolkit/crashreporter/google-breakpad/src/client/Makefile.in
@@ -0,0 +1,57 @@
+# ***** 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 Breakpad integration
+#
+# The Initial Developer of the Original Code is
+# Ted Mielczarek <ted.mielczarek@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= minidump_file_writer
+LIBRARY_NAME	= minidump_file_writer_s
+XPI_NAME 	= crashreporter
+
+LOCAL_INCLUDES 	= -I$(srcdir)/..
+
+CPPSRCS	= \
+  minidump_file_writer.cc \
+  $(NULL)
+
+# need static lib
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in b/mozilla/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
index f0f3c1e9b20..b75b42f0ad4 100644
--- a/mozilla/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
+++ b/mozilla/toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
@@ -51,7 +51,6 @@ CPPSRCS	= \
   exception_handler.cc \
   minidump_generator.cc \
   dynamic_images.cc \
-  ../../minidump_file_writer.cc \
   $(NULL)
 
 # need static lib
diff --git a/mozilla/toolkit/crashreporter/test/Makefile.in b/mozilla/toolkit/crashreporter/test/Makefile.in
index d556b40921f..c0abf515311 100644
--- a/mozilla/toolkit/crashreporter/test/Makefile.in
+++ b/mozilla/toolkit/crashreporter/test/Makefile.in
@@ -77,6 +77,7 @@ endif
 ifeq ($(OS_ARCH),Darwin)
 OS_LIBS += -framework Cocoa -lcrypto
 LIBS += \
+	$(DEPTH)/toolkit/airbag/airbag/src/client/$(LIB_PREFIX)minidump_file_writer_s.$(LIB_SUFFIX) \
 	$(DEPTH)/toolkit/airbag/airbag/src/client/mac/handler/$(LIB_PREFIX)exception_handler_s.$(LIB_SUFFIX) \
 	$(DEPTH)/toolkit/airbag/airbag/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
 	$(DEPTH)/toolkit/airbag/airbag/src/common/mac/$(LIB_PREFIX)breakpad_mac_common_s.$(LIB_SUFFIX) \