diff --git a/.gitignore b/.gitignore
index 3659a97235d90a50ed6d5d9ce02283483cebc70c..c372f1e97f2e9fbccd5d742abc758c8d48e6318c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
 
 # Configuration and runtime data
 /config.mak
+/config_generated.mak
 /*.toml
diff --git a/Makefile b/Makefile
index c6ccee7d1b6c6e5bb9aa6415063b4bfddc717574..16520b690d958305dcdc3932b47d50911ae9c109 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 # Makefile for Gitaly
 
+# Generated automatically
+-include config_generated.mak
+
 # You can override options by creating a "config.mak" file in Gitaly's root
 # directory.
 -include config.mak