diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index 3ffe4da46c4..557894112d1 100644
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -668,7 +668,8 @@ gen_dump(const EntryList &head, std::ostream &fout)
          "static void" << std::endl <<
          "dump_config(StoreEntry *entry)" << std::endl <<
          "{" << std::endl <<
-         "    debugs(5, 4, MYNAME);" << std::endl;
+         "    debugs(5, 4, MYNAME);" << std::endl <<
+         "    storeAppendPrintf(entry, \"# File: %s\\n\", ConfigFile);" << std::endl;
 
     for (const auto &e : head) {
 
diff --git a/src/main.cc b/src/main.cc
index 51859775035..6b264b54a2a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -650,7 +650,9 @@ mainHandleCommandLineOption(const int optId, const char *optValue)
         printf("For legal restrictions on distribution see https://www.openssl.org/source/license.html\n\n");
 #endif
 #endif
-        printf( "configure options: %s\n", SQUID_CONFIGURE_OPTIONS);
+
+        printf("Running Configuration in: %s\n", ConfigFile);
+        printf("Build configure options: %s\n", SQUID_CONFIGURE_OPTIONS);
 
 #if USE_WIN32_SERVICE
 
@@ -1484,6 +1486,8 @@ RegisterModules()
 int
 SquidMain(int argc, char **argv)
 {
+    ConfigFile = xstrdup(DEFAULT_CONFIG_FILE);
+
     // We must register all modules before the first RunRegisteredHere() call.
     // We do it ASAP/here so that we do not need to move this code when we add
     // earlier hooks to the RegisteredRunner API.
@@ -1570,9 +1574,6 @@ SquidMain(int argc, char **argv)
     {
         int parse_err;
 
-        if (!ConfigFile)
-            ConfigFile = xstrdup(DEFAULT_CONFIG_FILE);
-
         assert(!configured_once);
 
         Mem::Init();