diff --git a/mozilla/camino/Makefile b/mozilla/camino/Makefile
index ff2306af41f..271a33b298d 100644
--- a/mozilla/camino/Makefile
+++ b/mozilla/camino/Makefile
@@ -59,7 +59,7 @@ TARGET		= Camino
 endif
 
 all:
-	pbxbuild -target $(TARGET) -buildstyle $(BUILDSTYLE)
+	$(PBBUILD) -target $(TARGET) -buildstyle $(BUILDSTYLE)
 
 clean clobber:
 	rm -rf build
diff --git a/mozilla/camino/Makefile.in b/mozilla/camino/Makefile.in
index 2a7d5f03e8b..3e0daab9bae 100644
--- a/mozilla/camino/Makefile.in
+++ b/mozilla/camino/Makefile.in
@@ -70,7 +70,7 @@ export::
 endif
 
 libs::
-	pbxbuild -target $(TARGET) -buildstyle $(BUILDSTYLE)
+	$(PBBUILD) -target $(TARGET) -buildstyle $(BUILDSTYLE)
 
 clean clobber::
 	rm -rf build
diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 4824732c266..ecc82719c13 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -255,6 +255,7 @@ XARGS		= @XARGS@
 STRIP		= @STRIP@
 DOXYGEN		= @DOXYGEN@
 MAKE		= @MAKE@
+PBBUILD		= @PBBUILD@
 
 ifdef MOZ_NATIVE_JPEG
 JPEG_CFLAGS	= @JPEG_CFLAGS@
diff --git a/mozilla/configure.in b/mozilla/configure.in
index c9b53ddccb6..3bdaf1a018e 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -432,6 +432,11 @@ AC_PATH_PROG(XARGS, xargs)
 if test -z "$XARGS" || test "$XARGS" = ":"; then
     AC_MSG_ERROR([xargs not found in \$PATH .])
 fi
+case "$target_os" in
+darwin*)
+    AC_PATH_PROGS(PBBUILD, pbbuild pbxbuild)
+    ;;
+esac
 
 dnl Be sure the make we use is GNU make.
 dnl on win32, gmake.exe is the generally the wrong version
@@ -850,8 +855,8 @@ case "$target" in
 
 *-darwin*) 
     _PEDANTIC=
-    CFLAGS="$CFLAGS -fpascal-strings -traditional-cpp -fno-common"
-    CXXFLAGS="$CXXFLAGS -fpascal-strings -traditional-cpp -fno-common"
+    CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
+    CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
     DLL_SUFFIX=".dylib"
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
diff --git a/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in b/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in
index d1790f52df1..241c0e11e4e 100644
--- a/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in
+++ b/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in
@@ -59,7 +59,7 @@ export::
 endif
 
 libs::
-	pbxbuild -buildstyle $(BUILDSTYLE) install
+	$(PBBUILD) -buildstyle $(BUILDSTYLE) install
 	mkdir -p $(DIST)/package
 	cp -R build/UninstalledProducts/PrintPDE.plugin $(DIST)/package/
 
diff --git a/mozilla/modules/plugin/samples/default/mac/Makefile.in b/mozilla/modules/plugin/samples/default/mac/Makefile.in
index b7a4fd41589..63c0f831e54 100644
--- a/mozilla/modules/plugin/samples/default/mac/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/mac/Makefile.in
@@ -81,7 +81,7 @@ install-plugin: build-plugin
 resources: $(RESOURCE_FILES)
 
 build-plugin: resources
-	pbxbuild -target $(TARGET) -buildstyle $(BUILDSTYLE)
+	$(PBBUILD) -target $(TARGET) -buildstyle $(BUILDSTYLE)
 
 _%.rsrc: %.rsrc
 	$(ASDECODE) $< $@