diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 0a41010bd88..36f4d588726 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -79,6 +79,8 @@ MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
 
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
 MOZ_GFX_TOOLKIT		= @MOZ_GFX_TOOLKIT@
+MOZ_GFX_OPTIMIZE_MOBILE = @MOZ_GFX_OPTIMIZE_MOBILE@
+
 MOZ_DFB			= @MOZ_DFB@
 MOZ_X11			= @MOZ_X11@
 
diff --git a/configure.in b/configure.in
index e58bcc6a8ff..ccc9980d2cf 100644
--- a/configure.in
+++ b/configure.in
@@ -1989,6 +1989,8 @@ case "$target" in
     USE_SHORT_LIBNAME=1
     MOZ_ENABLE_POSTSCRIPT=
     MOZ_USER_DIR="Mozilla"
+
+    MOZ_GFX_OPTIMIZE_MOBILE=1
 ;;
 
 
@@ -6155,8 +6157,7 @@ if test $NS_OSSO; then
         AC_MSG_ERROR([DBus is required when building for OSSO])
     fi
     AC_DEFINE(NS_OSSO)
-    dnl XXX this should go somewhere else; it's not just for OSSO
-    AC_DEFINE(MOZ_GFX_OPTIMIZE_MOBILE)
+    MOZ_GFX_OPTIMIZE_MOBILE=1
 fi
 AC_SUBST(LIBOSSO_CFLAGS)
 AC_SUBST(LIBOSSO_LIBS)
@@ -6258,6 +6259,19 @@ if test -n "$MOZ_DEBUG"; then
     CFLAGS=$_SAVE_CFLAGS
 fi
 
+dnl ========================================================
+dnl enable mobile optimizations
+dnl ========================================================
+MOZ_ARG_ENABLE_BOOL(mobile-optimize,
+[  --enable-mobile-optimize   Enable mobile optimizations],
+    MOZ_GFX_OPTIMIZE_MOBILE=1)
+
+AC_SUBST(MOZ_GFX_OPTIMIZE_MOBILE)
+
+if test "$MOZ_GFX_OPTIMIZE_MOBILE"; then
+    AC_DEFINE(MOZ_GFX_OPTIMIZE_MOBILE)
+fi
+
 dnl ========================================================
 dnl = Enable code optimization. ON by default.
 dnl ========================================================