diff --git a/.gitignore b/.gitignore
index bfe1c7cb..3957aad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ local.properties
 .flycheck-dir-locals.el
 .pylintrc
 .projectile
+.editorconfig
 .clang-format
 .style.yapf
 .irony
diff --git a/Makefile b/Makefile
index 3ebf8b4e..3b248f65 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ DOCPREFIX = "ballisticacore_"
 # things like tool config files, etc.
 PREREQS = .dir-locals.el .mypy.ini .pycheckers \
   .pylintrc .style.yapf .clang-format \
-  .projectile
+  .projectile .editorconfig
 
 # List the targets in this Makefile and basic descriptions for them.
 list:
@@ -310,6 +310,9 @@ TOOL_CFG_SRC = tools/efrotools/snippets.py config/config.json
 .projectile: config/toolconfigsrc/projectile ${TOOL_CFG_SRC}
 	${TOOL_CFG_INST} $< $@
 
+.editorconfig: config/toolconfigsrc/editorconfig ${TOOL_CFG_SRC}
+	${TOOL_CFG_INST} $< $@
+
 .dir-locals.el: config/toolconfigsrc/dir-locals.el ${TOOL_CFG_SRC}
 	${TOOL_CFG_INST} $< $@
 
diff --git a/.editorconfig b/config/toolconfigsrc/editorconfig
similarity index 100%
rename from .editorconfig
rename to config/toolconfigsrc/editorconfig