--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -3250,16 +3250,18 @@ Preferences::GetInstanceForService()
 
   } else {
     // Check if there is a deployment configuration file. If so, set up the
     // pref config machinery, which will actually read the file.
     nsAutoCString lockFileName;
     nsresult rv = Preferences::GetCString(
       "general.config.filename", lockFileName, PrefValueKind::User);
     if (NS_SUCCEEDED(rv)) {
+      Telemetry::ScalarSet(Telemetry::ScalarID::GENERAL_AUTOCONFIG_HAS_FILENAME,
+                           true);
       NS_CreateServicesFromCategory(
         "pref-config-startup",
         static_cast<nsISupports*>(static_cast<void*>(sPreferences)),
         "pref-config-startup");
     }
 
     nsCOMPtr<nsIObserverService> observerService =
       mozilla::services::GetObserverService();

--- a/toolkit/components/telemetry/Scalars.yaml
+++ b/toolkit/components/telemetry/Scalars.yaml
@@ -437,16 +437,31 @@ storage.sync.api.usage:
     kind: uint
     keyed: true
     notification_emails:
       - eglassercamp@mozilla.com
     release_channel_collection: opt-out
     record_in_processes:
       - main
 
+general.autoconfig:
+  has_filename:
+    bug_numbers:
+      - 1226616
+    description: >
+      Recorded on startup. Boolean stating whether the
+      general.autoconfig.filename preference has a value.
+    expires: never
+    kind: boolean
+    notification_emails:
+      - florian@mozilla.com
+    release_channel_collection: opt-out
+    record_in_processes:
+      - 'main'
+
 services.sync:
   fxa_verification_method:
     bug_numbers:
       - 1353645
     description: >
       The method we used ("push" or "poll") to determine the verification of a
       Firefox Account email.
     expires: "60"