diff --git a/mozilla/configure.in b/mozilla/configure.in
index 384e1b004df..462383c76f0 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -1593,7 +1593,7 @@ case "$target" in
 *-darwin*) 
     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    MOZ_OPTIMIZE_FLAGS="-O2"
+    MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
     _PEDANTIC=
     CFLAGS="$CFLAGS -fpascal-strings -fno-common"
     CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
diff --git a/mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER b/mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER
index af9cb3b384c..17c4412246d 100644
--- a/mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER
+++ b/mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER
@@ -1,2 +1,2 @@
-Clobbering to land system changes in 407794.
+Clobbering to test linux build settings on mac.