diff --git a/.gitignore b/.gitignore
index ccbb46b030..70316aebc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 TARGETS
-build_config.mk
+make_config.mk
 
 *.a
 *.arc
diff --git a/Makefile b/Makefile
index 9dab353e39..26dde6b45c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ endif
 #-----------------------------------------------
 
 # detect what platform we're building on
-$(shell (export ROCKSDB_ROOT="$(CURDIR)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/build_config.mk"))
+$(shell (export ROCKSDB_ROOT="$(CURDIR)"; "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
 # this file is generated by the previous line to set build flags and sources
-include build_config.mk
+include make_config.mk
 
 ifneq ($(PLATFORM), IOS)
 CFLAGS += -g
@@ -302,7 +302,7 @@ unity: unity.cc unity.o
 	$(CXX) unity.o $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
 
 clean:
-	-rm -f $(PROGRAMS) $(TESTS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) build_config.mk unity.cc
+	-rm -f $(PROGRAMS) $(TESTS) $(LIBRARY) $(SHARED) $(MEMENVLIBRARY) make_config.mk unity.cc
 	-rm -rf ios-x86/* ios-arm/*
 	-find . -name "*.[oda]" -exec rm {} \;
 	-find . -type f -regex ".*\.\(\(gcda\)\|\(gcno\)\)" -exec rm {} \;
diff --git a/examples/Makefile b/examples/Makefile
index efc5fe30e1..7bd88fbf0b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,4 +1,4 @@
-include ../build_config.mk
+include ../make_config.mk
 
 .PHONY: clean