diff --git a/.gitignore b/.gitignore
index 8794354e..efa98fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Makefile.config
 TAGS
 tags
 *cscope*
diff --git a/Makefile b/Makefile
index 2cd1b1ba..ae0f9912 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,9 @@ include Makefile.local
 include lib/Makefile.local
 
 # And get user settings from the output of configure
+Makefile.config: configure
+	./configure
+
 include Makefile.config
 
 # The user has not set any verbosity, default to quiet mode and inform the
diff --git a/Makefile.config b/Makefile.config
deleted file mode 100644
index ddc74365..00000000
--- a/Makefile.config
+++ /dev/null
@@ -1,3 +0,0 @@
-prefix = /usr/local
-bash_completion_dir = /etc/bash_completion.d
-CFLAGS += -DHAVE_VALGRIND