diff --git a/Documentation/config.txt b/Documentation/config.txt
index eb66a11975..62a2e9cecf 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -6,7 +6,9 @@ the Git commands' behavior. The `.git/config` file in each repository
 is used to store the configuration for that repository, and
 `$HOME/.gitconfig` is used to store a per-user configuration as
 fallback values for the `.git/config` file. The file `/etc/gitconfig`
-can be used to store a system-wide default configuration.
+can be used to store a system-wide default configuration. On Windows,
+configuration can also be stored in `C:\ProgramData\Git\config`; This
+file will be used also by libgit2-based software.
 
 The configuration variables are used by both the Git plumbing
 and the porcelains. The variables are divided into sections, wherein
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 8e240435be..4e4021a93e 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -281,6 +281,11 @@ $XDG_CONFIG_HOME/git/config::
 $GIT_DIR/config::
 	Repository specific configuration file.
 
+On Windows, as there is no central `/etc/` directory, there is yet another
+config file, intended to contain settings for *all* Git-related software
+running on the machine. Consequently, this config file takes an even lower
+precedence than the `$(prefix)/etc/gitconfig` file.
+
 If no further options are given, all reading options will read all of these
 files that are available. If the global or the system-wide configuration
 file are not available they will be ignored. If the repository configuration
diff --git a/Documentation/git.txt b/Documentation/git.txt
index dba7f0c18e..f54d4d1080 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -567,7 +567,8 @@ for further details.
 
 `GIT_CONFIG_NOSYSTEM`::
 	Whether to skip reading settings from the system-wide
-	`$(prefix)/etc/gitconfig` file.  This environment variable can
+	`$(prefix)/etc/gitconfig` file (and on Windows, also from the
+	`%PROGRAMDATA%\Git\config` file).  This environment variable can
 	be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a
 	predictable environment for a picky script, or you can set it
 	temporarily to avoid using a buggy `/etc/gitconfig` file while
diff --git a/compat/mingw.c b/compat/mingw.c
index 45c8046c7c..665dcbdc2d 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2362,3 +2362,17 @@ int uname(struct utsname *buf)
 		  "%u", (v >> 16) & 0x7fff);
 	return 0;
 }
+
+const char *program_data_config(void)
+{
+	static struct strbuf path = STRBUF_INIT;
+	static unsigned initialized;
+
+	if (!initialized) {
+		const char *env = mingw_getenv("PROGRAMDATA");
+		if (env)
+			strbuf_addf(&path, "%s/Git/config", env);
+		initialized = 1;
+	}
+	return *path.buf ? path.buf : NULL;
+}
diff --git a/compat/mingw.h b/compat/mingw.h
index f31dcff2be..45667999ce 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -426,6 +426,8 @@ int mingw_offset_1st_component(const char *path);
 #define PATH_SEP ';'
 extern char *mingw_query_user_email(void);
 #define query_user_email mingw_query_user_email
+extern const char *program_data_config(void);
+#define git_program_data_config program_data_config
 #if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
 #define PRIuMAX "I64u"
 #define PRId64 "I64d"
diff --git a/config.c b/config.c
index 3461993f0a..0336fa9989 100644
--- a/config.c
+++ b/config.c
@@ -1680,9 +1680,16 @@ static int do_git_config_sequence(const struct config_options *opts,
 		repo_config = NULL;
 
 	current_parsing_scope = CONFIG_SCOPE_SYSTEM;
-	if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0))
-		ret += git_config_from_file(fn, git_etc_gitconfig(),
-					    data);
+	if (git_config_system()) {
+		if (git_program_data_config() &&
+		    !access_or_die(git_program_data_config(), R_OK, 0))
+			ret += git_config_from_file(fn,
+						    git_program_data_config(),
+						    data);
+		if (!access_or_die(git_etc_gitconfig(), R_OK, 0))
+			ret += git_config_from_file(fn, git_etc_gitconfig(),
+						    data);
+	}
 
 	current_parsing_scope = CONFIG_SCOPE_GLOBAL;
 	if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
diff --git a/git-compat-util.h b/git-compat-util.h
index 71779cb0ae..03406f21a7 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -386,6 +386,10 @@ static inline char *git_find_last_dir_sep(const char *path)
 #define query_user_email() NULL
 #endif
 
+#ifndef git_program_data_config
+#define git_program_data_config() NULL
+#endif
+
 #if defined(__HP_cc) && (__HP_cc >= 61000)
 #define NORETURN __attribute__((noreturn))
 #define NORETURN_PTR