--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -938,16 +938,27 @@ xulrunner/app/profile/chrome/Makefile
 xulrunner/app/profile/extensions/Makefile
 xulrunner/installer/Makefile
 xulrunner/installer/mac/Makefile
 "
 
 MAKEFILES_xulapp="
 toolkit/Makefile
 toolkit/library/Makefile
+toolkit/airbag/Makefile
+toolkit/airbag/client/Makefile
+toolkit/airbag/airbag/src/client/Makefile
+toolkit/airbag/airbag/src/client/mac/handler/Makefile
+toolkit/airbag/airbag/src/client/windows/Makefile
+toolkit/airbag/airbag/src/client/windows/handler/Makefile
+toolkit/airbag/airbag/src/client/windows/sender/Makefile
+toolkit/airbag/airbag/src/common/Makefile
+toolkit/airbag/airbag/src/common/mac/Makefile
+toolkit/airbag/airbag/src/common/windows/Makefile
+toolkit/airbag/airbag/src/tools/mac/dump_syms/Makefile
 toolkit/content/Makefile
 toolkit/content/buildconfig.html
 toolkit/obsolete/Makefile
 toolkit/components/alerts/Makefile
 toolkit/components/alerts/public/Makefile
 toolkit/components/alerts/src/Makefile
 toolkit/components/autocomplete/Makefile
 toolkit/components/autocomplete/public/Makefile

--- a/toolkit/airbag/Makefile.in
+++ b/toolkit/airbag/Makefile.in
@@ -59,16 +59,17 @@ ifeq  ($(OS_ARCH),WINNT)
 		airbag/src/client/windows \
 		$(NULL)
 endif
 
 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)
 endif
 
 DIRS += client
 
 LOCAL_INCLUDES = -I$(srcdir)/airbag/src

new file mode 100644
--- /dev/null
+++ b/toolkit/airbag/airbag/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

--- a/toolkit/airbag/airbag/src/client/mac/handler/Makefile.in
+++ b/toolkit/airbag/airbag/src/client/mac/handler/Makefile.in
@@ -46,15 +46,14 @@ LIBRARY_NAME	= exception_handler_s
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../../..
 
 CPPSRCS	= \
   exception_handler.cc \
   minidump_generator.cc \
   dynamic_images.cc \
-  ../../minidump_file_writer.cc \
   $(NULL)
 
 # need static lib
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/airbag/test/Makefile.in
+++ b/toolkit/airbag/test/Makefile.in
@@ -72,16 +72,17 @@ LIBS += \
 	$(DEPTH)/toolkit/airbag/airbag/src/common/windows/$(LIB_PREFIX)breakpad_windows_common_s.$(LIB_SUFFIX)
 LIBS += $(call expand_libname shell32)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32)
 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) \
 	$(NULL)
 LOCAL_INCLUDES += -I$(srcdir) -I$(srcdir)/../airbag/src/common/mac/
 endif
 
 ifndef MOZ_ENABLE_LIBXUL