diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx
index df15658618d41cd23cc77b7561560b745bc6a735..42bd2386737634cd08d75f4cec8ac9d6d47db1e4 100644
--- a/core/dictgen/src/rootcling_impl.cxx
+++ b/core/dictgen/src/rootcling_impl.cxx
@@ -4214,7 +4214,7 @@ int RootClingMain(int argc,
       // flag is passed.
 
       // includeDir is where modulemaps exist.
-      clingArgsInterpreter.push_back("-modulemap_overlay=" + includeDir);
+      clingArgsInterpreter.push_back("-includedir_loc=" + includeDir);
 #endif //R__MACOSX
 
       // We just pass -fmodules, the CIFactory will do the rest and configure
diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
index b16bd1da109b5209cdc1d02e2b62c525b2ce0e04..9cf05e7132344343897450d1720516c525e1dfc5 100644
--- a/core/metacling/src/TCling.cxx
+++ b/core/metacling/src/TCling.cxx
@@ -1279,6 +1279,10 @@ TCling::TCling(const char *name, const char *title, const char* const argv[])
       }
    }
 
+   if (fCxxModulesEnabled) {
+      clingArgsStorage.push_back("-includedir_loc=" + std::string(TROOT::GetIncludeDir().Data()));
+   }
+
    // FIXME: This only will enable frontend timing reports.
    EnvOpt = llvm::sys::Process::GetEnv("ROOT_CLING_TIMING");
    if (EnvOpt.hasValue())
diff --git a/interpreter/cling/include/cling/Interpreter/ClingOptions.inc b/interpreter/cling/include/cling/Interpreter/ClingOptions.inc
index 3db55e960200a170919fa2028dd579f1e196c1c8..50d59dfa81880ebfd25f4f7bd5ae9e73427b0cc2 100644
--- a/interpreter/cling/include/cling/Interpreter/ClingOptions.inc
+++ b/interpreter/cling/include/cling/Interpreter/ClingOptions.inc
@@ -31,7 +31,7 @@ OPTION(prefix_2, "metastr=", _metastr_EQ, Joined, INVALID, INVALID, 0, 0, 0,
        "Set the meta command tag, default '.'", 0, 0)
 OPTION(prefix_2, "metastr", _metastr, Separate, INVALID, INVALID, 0, 0, 0,
        "Set the meta command tag, default '.'", 0, 0)
-OPTION(prefix_1, "modulemap_overlay=", overlay_EQ, Joined, INVALID, INVALID, 0, 0, 0,
+OPTION(prefix_1, "includedir_loc=", overlay_EQ, Joined, INVALID, INVALID, 0, 0, 0,
        "Set the Modules overlay file", 0, 0)
 OPTION(prefix_2, "nologo", _nologo, Flag, INVALID, INVALID, 0, 0, 0,
        "Do not show startup-banner", 0, 0)