diff --git a/browser/config/mozconfigs/macosx-lion-universal/nightly b/browser/config/mozconfigs/macosx-lion-universal/nightly
new file mode 100644
index 00000000000..da575599dbd
--- /dev/null
+++ b/browser/config/mozconfigs/macosx-lion-universal/nightly
@@ -0,0 +1,24 @@
+. $topsrcdir/build/macosx/universal/mozconfig
+
+# Universal builds override the default of browser (bug 575283 comment 29)
+ac_add_options --enable-application=browser
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-codesighs
+ac_add_options --disable-install-strip
+
+# Nightlies only since this has a cost in performance
+ac_add_options --enable-js-diagnostics
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+export MOZ_TELEMETRY_REPORTING=1
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+
+ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx-lion-universal/release b/browser/config/mozconfigs/macosx-lion-universal/release
new file mode 100644
index 00000000000..0acefb03ecd
--- /dev/null
+++ b/browser/config/mozconfigs/macosx-lion-universal/release
@@ -0,0 +1,20 @@
+. $topsrcdir/build/macosx/universal/mozconfig
+
+# Universal builds override the default of browser (bug 575283 comment 29)
+ac_add_options --enable-application=browser
+
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --enable-official-branding
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+export MOZ_TELEMETRY_REPORTING=1
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+
+# Enable parallel compiling
+mk_add_options MOZ_MAKE_FLAGS="-j4"
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx-lion-universal/shark b/browser/config/mozconfigs/macosx-lion-universal/shark
new file mode 100644
index 00000000000..48f355dbe1b
--- /dev/null
+++ b/browser/config/mozconfigs/macosx-lion-universal/shark
@@ -0,0 +1,26 @@
+# Just like nightlies, but without tests, not on an update channel, and with
+# shark and dtrace enabled
+. $topsrcdir/build/macosx/universal/mozconfig
+
+# Universal builds override the default of browser (bug 575283 comment 29)
+ac_add_options --enable-application=browser
+
+ac_add_options --disable-tests
+ac_add_options --disable-install-strip
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Enable parallel compiling
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+
+# shark specific options
+ac_add_options --enable-shark
+ac_add_options --enable-dtrace
+
+# Need this to prevent name conflicts with the normal nightly build packages
+export MOZ_PKG_SPECIAL="shark"
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx32-lion/debug b/browser/config/mozconfigs/macosx32-lion/debug
new file mode 100644
index 00000000000..cc7a05b93b5
--- /dev/null
+++ b/browser/config/mozconfigs/macosx32-lion/debug
@@ -0,0 +1,12 @@
+. $topsrcdir/build/macosx/mozconfig.leopard
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+
+# Enable parallel compiling
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-macbundlename-prefix=Firefox
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx64-lion/debug b/browser/config/mozconfigs/macosx64-lion/debug
new file mode 100644
index 00000000000..73cbd46a179
--- /dev/null
+++ b/browser/config/mozconfigs/macosx64-lion/debug
@@ -0,0 +1,17 @@
+. $topsrcdir/build/macosx/common
+
+ac_add_options --enable-debug
+ac_add_options --enable-trace-malloc
+ac_add_options --enable-accessibility
+
+# Enable parallel compiling
+mk_add_options MOZ_MAKE_FLAGS="-j12"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+ac_add_options --with-macbundlename-prefix=Firefox
+
+# Treat warnings as errors in directories with FAIL_ON_WARNINGS.
+ac_add_options --enable-warnings-as-errors
+ac_add_options --with-ccache
diff --git a/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig b/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig
new file mode 100644
index 00000000000..304914322ca
--- /dev/null
+++ b/browser/config/mozconfigs/macosx64-lion/l10n-mozconfig
@@ -0,0 +1,5 @@
+ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --enable-official-branding
+ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-packaging
+ac_add_options --with-ccache