diff --git a/.gitignore b/.gitignore
index 2f9112492..21cbd0826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,7 @@
 /Release
 /autom4te.cache
 /build-config
-/build-config
+/build-config.local
 /build-stamp
 /config.cache
 /config.guess
diff --git a/rake.d/config.rb b/rake.d/config.rb
index a6f7dca56..3c2857646 100644
--- a/rake.d/config.rb
+++ b/rake.d/config.rb
@@ -12,7 +12,11 @@ end
 
 def read_build_config
   fail "build-config not found: please run ./configure" unless File.exists?("build-config")
-  read_config_file("build-config")
+
+  config = read_config_file("build-config")
+  config = config.merge(read_config_file("build-config.local")) if File.exists?("build-config.local")
+
+  config
 end
 
 def c(idx, default = '')