diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index c2749573b8b..e991154f4e2 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -1,5 +1,4 @@
 
-#Finally, the build!
 if [ "$PGO" == "y" ] ; then
   #CCache breaks the pgo build
   export CCACHE_DISABLE=1  &&
diff --git a/web/firefox/PRE_BUILD b/web/firefox/PRE_BUILD
index 989cc7d81bf..8fb201e4a71 100644
--- a/web/firefox/PRE_BUILD
+++ b/web/firefox/PRE_BUILD
@@ -1,10 +1,10 @@
 if [ ! -e /usr/include/cairo/cairo-tee.h ] ; then
-  message "${PROBLEM_COLOR}Run:  ${MODULE_COLOR}lin -c cairo"
-  message "${MESSAGE_COLOR}To recompile cairo with tee support, which is required by firefox.${DEFAULT_COLOR}"
-  exit 1
-fi
+  message "${PROBLEM_COLOR}Run:  ${MODULE_COLOR}lin -rc cairo" &&
+  message "${MESSAGE_COLOR}To recompile cairo with tee(libX11) support, which is required by firefox.${DEFAULT_COLOR}" &&
+  false
+fi &&
 
-default_pre_build
+default_pre_build &&
 
 # To skirt around this make failure in libxul.so:
 # ftbzip2.c:183: undefined reference to `BZ2_bzDecompressInit'
@@ -29,7 +29,6 @@ cp $SCRIPT_DIRECTORY/mozconfig .  &&
 export MOZ_OBJDIR="${SOURCE_DIRECTORY}/build-mozilla"  &&
 mkdir -p ${MOZ_OBJDIR}  &&
 
-
 if module_installed gst-plugins-base-1.0 ; then
   echo "ac_add_options --enable-gstreamer=1.0" >> mozconfig
    else
diff --git a/web/firefox/mozconfig b/web/firefox/mozconfig
index de979830974..4eb3b59e18a 100644
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -29,6 +29,7 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-necko-wifi
 ac_add_options --enable-replace-malloc
 ac_add_options --enable-system-cairo
+ac_add_options --disable-gnomevfs
 
 # startupcache deterministically segfaults on *some* systems. Just leave it disabled.
 ac_add_options --disable-startupcache