diff --git a/browser/confvars.sh b/browser/confvars.sh
index 6fa324be930b..faf107d3d62c 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -35,7 +35,6 @@ BROWSER_CHROME_URL=chrome://browser/content/browser.xhtml
 # For the mozilla-aurora repository, use "aurora".
 MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
-MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
 MOZ_PROFILE_MIGRATOR=1
 
diff --git a/browser/moz.configure b/browser/moz.configure
index dbb5eb265022..aa4affef82e3 100644
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -11,6 +11,9 @@ imply_option("MOZ_DEDICATED_PROFILES", True)
 imply_option("MOZ_BLOCK_PROFILE_DOWNGRADE", True)
 imply_option("MOZ_NORMANDY", True)
 
+
+imply_option("MOZ_APP_ID", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}")
+
 with only_when(target_has_linux_kernel & compile_environment):
     option(env="MOZ_NO_PIE_COMPAT", help="Enable non-PIE wrapper")
 
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 97b9bab16739..67938003b634 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1047,7 +1047,6 @@ set_config("MOZILLA_OFFICIAL", mozilla_official)
 set_define("MOZILLA_OFFICIAL", mozilla_official)
 add_old_configure_assignment("MOZILLA_OFFICIAL", mozilla_official)
 
-
 # Allow specifying custom paths to the version files used by the milestone() function below.
 option(
     "--with-version-file-path",
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index f9118b6621d1..56482ef7dc65 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -13,5 +13,3 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_RAW=1
-
-MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 26ea6f6f7e91..f08a66d8f81f 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -61,6 +61,8 @@ imply_option("MOZ_NORMANDY", False)
 imply_option("MOZ_SERVICES_HEALTHREPORT", True)
 imply_option("MOZ_GECKOVIEW_HISTORY", True)
 
+imply_option("MOZ_APP_ID", "{aa3c5121-dab2-40e2-81ca-7ea25febc110}")
+
 
 @depends(target)
 def check_target(target):
diff --git a/old-configure.in b/old-configure.in
index 9fc23415b225..38f34ba6abe9 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -733,8 +733,6 @@ AC_SUBST(MOZ_EME_PROCESS_BUNDLEID)
 # builds (e.g. Aurora for Firefox).
 # - MOZ_APP_PROFILE: When set, used for application.ini's
 # "Profile" field, which controls profile location.
-# - MOZ_APP_ID: When set, used for application.ini's "ID" field, and
-# crash reporter server url.
 # - MOZ_PROFILE_MIGRATOR: When set, enables profile migrator.
 
 # The following environment variables used to have an effect, but don't anymore:
@@ -767,7 +765,6 @@ fi
 AC_SUBST(MOZ_APP_DISPLAYNAME)
 AC_SUBST(MOZ_APP_VENDOR)
 AC_SUBST(MOZ_APP_PROFILE)
-AC_SUBST(MOZ_APP_ID)
 AC_SUBST(MAR_CHANNEL_ID)
 AC_SUBST(ACCEPTED_MAR_CHANNEL_IDS)
 AC_SUBST(MOZ_PROFILE_MIGRATOR)
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 31a498bfcc76..2f4568dbfd38 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -4,6 +4,15 @@
 # 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/.
 
+# App-specific project settings
+
+
+project_flag(
+    env="MOZ_APP_ID",
+    nargs=1,
+    help='used for application.ini\'s "ID" field, and crash reporter server url',
+)
+
 
 # Set the MOZ_CONFIGURE_OPTIONS variable with all the options that
 # were passed somehow (environment, command line, mozconfig)
diff --git a/tools/update-programs/confvars.sh b/tools/update-programs/confvars.sh
index 66e2a806058d..96834f590bd9 100644
--- a/tools/update-programs/confvars.sh
+++ b/tools/update-programs/confvars.sh
@@ -6,7 +6,6 @@
 MOZ_APP_VENDOR=Mozilla
 
 MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
-MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 
 # Build the updater by default.  Use --disable-updater to not.
 MOZ_UPDATER=1