diff --git a/.mozconfig b/.mozconfig
index e9c8d5fb65219..b33d7a867d566 100644
--- a/.mozconfig
+++ b/.mozconfig
@@ -1,7 +1,8 @@
 # Very simplified mozconfig because builds are made in native OS X environment
 
+export MAKE=gmake
 export STRIP=strip
-export RUSTFLAGS="-C target-cpu=core2"
+export RUSTFLAGS="-C opt-level=3 -C target-cpu=core2"
 X=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
 mk_add_options MOZ_MAKE_FLAGS=-j${X}
 ac_add_options --target=x86_64-apple-darwin
diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt
index 5b58fc0580c2d..b49c11885d972 100644
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1 +1 @@
-G3.2.7-osxfix
\ No newline at end of file
+G3.2.7-osxfix-eol
\ No newline at end of file