diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 093f9e8d03d..be7dedc858c 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -517,6 +517,8 @@ MOZ_STATIC_MAIL_BUILD = @MOZ_STATIC_MAIL_BUILD@
 MOZ_SUNBIRD	= @MOZ_SUNBIRD@
 WINCE		= @WINCE@
 
+MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
+
 MINIMO		= @MINIMO@
 
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
diff --git a/mozilla/other-licenses/branding/firefox/content/Makefile.in b/mozilla/other-licenses/branding/firefox/content/Makefile.in
index 1decefbe874..827181f9b49 100644
--- a/mozilla/other-licenses/branding/firefox/content/Makefile.in
+++ b/mozilla/other-licenses/branding/firefox/content/Makefile.in
@@ -8,16 +8,4 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-AB_CD = $(MOZ_UI_LOCALE)
-
-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID_UNQUOTED)
-
 include $(topsrcdir)/config/rules.mk
-
-libs locale::
-	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
-	  $(srcdir)/browserconfig.properties > $(DIST)/bin/browserconfig.properties
-
-install::
-	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
-	  $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties
diff --git a/mozilla/other-licenses/branding/firefox/locales/Makefile.in b/mozilla/other-licenses/branding/firefox/locales/Makefile.in
index 73db1e88fd0..62c2cfacaf6 100755
--- a/mozilla/other-licenses/branding/firefox/locales/Makefile.in
+++ b/mozilla/other-licenses/branding/firefox/locales/Makefile.in
@@ -42,6 +42,14 @@ relativesrcdir = other-licenses/branding/firefox/locales
 
 include $(DEPTH)/config/autoconf.mk
 
-DEFINES += -DAB_CD=$(AB_CD)
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
 
 include $(topsrcdir)/config/rules.mk
+
+libs::
+	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	  $(srcdir)/browserconfig.properties > $(FINAL_TARGET)/browserconfig.properties
+
+install::
+	@$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
+	  $(srcdir)/browserconfig.properties > $(DESTDIR)$(mozappdir)/browserconfig.properties
diff --git a/mozilla/other-licenses/branding/firefox/content/browserconfig.properties b/mozilla/other-licenses/branding/firefox/locales/browserconfig.properties
old mode 100644
new mode 100755
similarity index 100%
rename from mozilla/other-licenses/branding/firefox/content/browserconfig.properties
rename to mozilla/other-licenses/branding/firefox/locales/browserconfig.properties