diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2 b/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2
index b7e0ea185..0190aee89 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2
@@ -21,7 +21,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-ff2
+mk_add_options MOZ_OBJDIR=/moz_obj/browser
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
@@ -48,7 +48,7 @@ ac_add_options --enable-static --disable-shared ## STATIC BUILD
 ### Optional optimizations
 export BUILD_OPT=1
 mk_add_options BUILD_OPT=1
-ac_add_options --enable-optimize='-O1 -march=pentium -mcpu=pentiumpro'
+ac_add_options --enable-optimize='-march=pentium -mcpu=pentiumpro'
 
 ### //Eliminate lots of relatively useless warnings during build
 ac_add_options --disable-cpp-exceptions
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2--DEBUG b/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2--DEBUG
index 52d0a92d1..76f6546db 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2--DEBUG
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-firefox2--DEBUG
@@ -27,7 +27,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-ff2-debug
+mk_add_options MOZ_OBJDIR=/moz_obj/debug-browser
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey b/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey
index eba2f3840..684f8b4f5 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey
@@ -19,7 +19,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-sm
+mk_add_options MOZ_OBJDIR=/moz_obj/suite
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
@@ -48,7 +48,7 @@ ac_add_options --disable-ipv6
 ### //K6's, Pre-Pentium II aren't supported with i586, use i586.
 export BUILD_OPT=1
 mk_add_options BUILD_OPT=1
-ac_add_options --enable-optimize='-O1 -march=pentium -mcpu=pentiumpro'
+ac_add_options --enable-optimize='-march=pentium -mcpu=pentiumpro'
 ac_add_options --enable-static --disable-shared ## STATIC BUILD
 #ac_add_options --disable-static --enabled-shared ## SHARED Libraries
 
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey--DEBUG b/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey--DEBUG
index 6556ba807..ab40fc3c9 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey--DEBUG
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey--DEBUG
@@ -19,7 +19,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-sm-DEBUG
+mk_add_options MOZ_OBJDIR=/moz_obj/debug-suite
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey-JustBrowser b/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey-JustBrowser
index 51692a6ae..7c2ba106c 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey-JustBrowser
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-seamonkey-JustBrowser
@@ -24,7 +24,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-sm-JustBrowser
+mk_add_options MOZ_OBJDIR=/moz_obj/suite-JustBrowser
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
@@ -53,7 +53,7 @@ ac_add_options --disable-ipv6
 ### //K6's, Pre-Pentium II aren't supported with i586, use i586.
 export BUILD_OPT=1
 mk_add_options BUILD_OPT=1
-ac_add_options --enable-optimize='-O1 -march=pentium -mcpu=pentiumpro'
+ac_add_options --enable-optimize='-march=pentium -mcpu=pentiumpro'
 
 ### // I'm getting linking problems.  
 ### // nsXULElement.cpp:(.text+0x76b9): undefined reference to `JS_XDRNewMem' 
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-sunbird b/www-client/mozilla-firefox/select-a-mozconfig/moz-sunbird
index fd70f69ca..1d51320d2 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-sunbird
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-sunbird
@@ -2,7 +2,7 @@
 . $topsrcdir/calendar/sunbird/config/mozconfig
 
 # //The outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-sb
+mk_add_options MOZ_OBJDIR=/moz_obj/calendar
 
 ### //Required to download the right version of the source code
 mk_add_options MOZ_CO_TAG=MOZILLA_1_8_BRANCH
@@ -48,4 +48,4 @@ ac_add_options --disable-cpp-exceptions
 ### Optional optimizations
 export BUILD_OPT=1
 mk_add_options BUILD_OPT=1
-ac_add_options --enable-optimize=-O1 -march=pentium -mcpu=pentiumpro'
+ac_add_options --enable-optimize='-march=pentium -mcpu=pentiumpro'
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird b/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird
index 0507dd410..3787fe022 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird
@@ -22,7 +22,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-tb
+mk_add_options MOZ_OBJDIR=/moz_obj/mailnews
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
@@ -52,7 +52,7 @@ ac_add_options --enable-static --disable-shared ## STATIC BUILD
 ### Optional optimizations
 export BUILD_OPT=1
 mk_add_options BUILD_OPT=1
-ac_add_options --enable-optimize='-O1 -march=pentium -mcpu=pentiumpro'
+ac_add_options --enable-optimize='-march=pentium -mcpu=pentiumpro'
 
 ### //Eliminate lots of relatively useless warnings during build
 ac_add_options --disable-cpp-exceptions
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird-lightning b/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird-lightning
index bacf717ae..64a277f29 100644
--- a/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird-lightning
+++ b/www-client/mozilla-firefox/select-a-mozconfig/moz-thunderbird-lightning
@@ -25,7 +25,7 @@ export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 mk_add_options CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
 
 ### //Set the outputdir for the build
-mk_add_options MOZ_OBJDIR=/objects/moz-tb-lightning
+mk_add_options MOZ_OBJDIR=/moz_obj/lightning
 
 ### //Automatic updates not currently supported on BeOS.  Delete this when we add this feature.
 ac_add_options --disable-updater
@@ -55,7 +55,7 @@ ac_add_options --enable-cpp-rtti
 ac_add_options --disable-static  ## SHARED Libraries
 
 ### Optional optimizations
-ac_add_options --enable-optimize='-O1 -march=pentium -mcpu=pentiumpro'
+ac_add_options --enable-optimize='-march=pentium -mcpu=pentiumpro'
 
 ### //Eliminate lots of relatively useless warnings during build
 ac_add_options --disable-cpp-exceptions