diff --git a/.gitignore b/.gitignore
index 1b6cbc3cc6..918fe5bd01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -117,4 +117,4 @@ obj-unix/
 /pkg/msvc/msvc-2010/Release Cg/*.pdb
 
 retroarch.cfg
-Makefile.custom
+Makefile.local
diff --git a/Makefile b/Makefile
index ffec2d8da2..564a8f375e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ include config.mk
 # Put your favorite compile flags in this file, if you want different defaults than upstream.
 # Do not attempt to create that file upstream.
 # (It'd be better to put this comment in that file, but .gitignore doesn't work on files that exist in the repo.)
--include Makefile.custom
+-include Makefile.local
 
 TARGET = retroarch