diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index b19fce81260..b3b082218c7 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -652,3 +652,5 @@ HAVE_ARM_NEON = @HAVE_ARM_NEON@
 MOZ_SPLASHSCREEN = @MOZ_SPLASHSCREEN@
 
 MOZ_THEME_FASTSTRIPE = @MOZ_THEME_FASTSTRIPE@
+
+MOZ_OFFICIAL_BRANDING = @MOZ_OFFICIAL_BRANDING@
diff --git a/configure.in b/configure.in
index 0e25b7c0e66..b5b7e4d74ec 100644
--- a/configure.in
+++ b/configure.in
@@ -4470,6 +4470,7 @@ BUILD_STATIC_LIBS=
 ENABLE_TESTS=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_BRANDING_DIRECTORY=
+MOZ_OFFICIAL_BRANDING=
 MOZ_DBGRINFO_MODULES=
 MOZ_ENABLE_CANVAS=1
 MOZ_ENABLE_CANVAS3D=
@@ -5025,8 +5026,14 @@ MOZ_ARG_ENABLE_BOOL(official-branding,
     AC_MSG_ERROR([You must specify MOZ_OFFICIAL_BRANDING_DIRECTORY to use --enable-official-branding.])
   else
     MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY}
+    MOZ_OFFICIAL_BRANDING=1
   fi
-])
+], MOZ_OFFICIAL_BRANDING=)
+
+AC_SUBST(MOZ_OFFICIAL_BRANDING)
+if test -n "$MOZ_OFFICIAL_BRANDING"; then
+  AC_DEFINE(MOZ_OFFICIAL_BRANDING)
+fi
 
 MOZ_ARG_WITH_STRING(branding,
 [  --with-branding=dir    Use branding from the specified directory.],