--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -35,11 +35,9 @@ MOZ_APP_ID={3c2e2abc-06d4-11e1-ac3b-374f
 
 MOZ_TIME_MANAGER=1
 
 MOZ_TOOLKIT_SEARCH=
 MOZ_B2G=1
 
 MOZ_JSDOWNLOADS=1
 
-MOZ_BUNDLED_FONTS=1
-
 export JS_GC_SMALL_CHUNK_SIZE=1

--- a/b2g/moz.configure
+++ b/b2g/moz.configure
@@ -23,10 +23,11 @@ option('--with-gonk-toolchain-prefix', n
        help='Prefix to gonk toolchain commands')
 
 @depends_if('--with-gonk-toolchain-prefix')
 def gonk_toolchain_prefix(value):
     return value
 
 imply_option('--with-toolchain-prefix', gonk_toolchain_prefix)
 
+imply_option('--enable-bundled-fonts', True)
 
 include('common.configure')

--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -3,21 +3,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MOZ_APP_BASENAME=Firefox
 MOZ_APP_VENDOR=Mozilla
 MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
-if test "$OS_ARCH" = "WINNT" -o \
-        "$OS_ARCH" = "Linux"; then
-  MOZ_BUNDLED_FONTS=1
-fi
-
 if test "$OS_ARCH" = "WINNT"; then
   MOZ_MAINTENANCE_SERVICE=1
   if ! test "$HAVE_64BIT_BUILD"; then
     if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
             "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta" -o \
             "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \
             "$MOZ_UPDATE_CHANNEL" = "release" -o \

--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -4,9 +4,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 imply_option('MOZ_SERVICES_SYNC', True)
 imply_option('MOZ_SERVICES_CLOUDSYNC', True)
 
+imply_option('--enable-bundled-fonts',
+             depends(target)(lambda t: t.os != 'OSX' or None),
+             reason='target')
+
 include('../toolkit/moz.configure')

--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -156,17 +156,16 @@ def old_configure_options(*options):
     '--datadir',
     '--enable-accessibility',
     '--enable-address-sanitizer',
     '--enable-alsa',
     '--enable-android-omx',
     '--enable-b2g-bt',
     '--enable-b2g-camera',
     '--enable-b2g-ril',
-    '--enable-bundled-fonts',
     '--enable-clang-plugin',
     '--enable-content-sandbox',
     '--enable-cookies',
     '--enable-cpp-rtti',
     '--enable-crashreporter',
     '--enable-dbus',
     '--enable-debug-js-modules',
     '--enable-directshow',

--- a/old-configure.in
+++ b/old-configure.in
@@ -3835,29 +3835,16 @@ if test -n "$MOZ_MAINTENANCE_SERVICE"; t
   if test "$OS_ARCH" = "WINNT"; then
     AC_DEFINE(MOZ_MAINTENANCE_SERVICE)
   else
     AC_MSG_ERROR([Can only build with --enable-maintenance-service with a Windows target])
   fi
 fi
 
 dnl ========================================================
-dnl Bundled fonts on desktop platforms
-dnl ========================================================
-
-MOZ_ARG_ENABLE_BOOL(bundled-fonts,
-[  --enable-bundled-fonts  Enable support for bundled fonts on desktop platforms],
-    MOZ_BUNDLED_FONTS=1,
-    MOZ_BUNDLED_FONTS=)
-
-if test -n "$MOZ_BUNDLED_FONTS"; then
-  AC_DEFINE(MOZ_BUNDLED_FONTS)
-fi
-
-dnl ========================================================
 dnl Verify MAR signatures
 dnl ========================================================
 
 MOZ_ARG_ENABLE_BOOL(verify-mar,
 [  --enable-verify-mar     Enable verifying MAR signatures],
     MOZ_VERIFY_MAR_SIGNATURE=1,
     MOZ_VERIFY_MAR_SIGNATURE= )
 

--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -844,8 +844,16 @@ with only_when('--enable-compile-environ
         if fuzzing and not afl:
             return True
 
     set_config('FUZZING', enable_fuzzing)
     set_define('FUZZING', enable_fuzzing)
 
     set_config('LIBFUZZER', enable_libfuzzer)
     set_define('LIBFUZZER', enable_libfuzzer)
+
+# Bundled fonts on desktop platforms
+# ========================================================
+option('--enable-bundled-fonts',
+       env='MOZ_BUNDLED_FONTS',
+       help='Enable support for bundled fonts on desktop platforms')
+
+set_define('MOZ_BUNDLED_FONTS', True, when='--enable-bundled-fonts')