diff --git a/Makefile b/Makefile
index 4caed794e..fc0dd8f28 100644
--- a/Makefile
+++ b/Makefile
@@ -791,7 +791,7 @@ define UNCRUSTIFY_TEMPLATE
 .PHONY: uncrustify_$(1)
 uncrustify_$(1):
 	@$(ECHO) "Auto-formatting $(1) source code"
-	$(V1) UNCRUSTIFY_CONFIG="make/templates/uncrustify.cfg" $(SHELL) make/scripts/uncrustify.sh $(call toprel, $(2))
+	$(V1) UNCRUSTIFY_CONFIG="$(ROOT_DIR)/make/uncrustify/uncrustify.cfg" $(SHELL) make/scripts/uncrustify.sh $(call toprel, $(2))
 endef
 
 $(eval $(call UNCRUSTIFY_TEMPLATE,flight,$(ROOT_DIR)/flight))
diff --git a/make/.gitattributes b/make/.gitattributes
index a2d27fb20..59b05a332 100644
--- a/make/.gitattributes
+++ b/make/.gitattributes
@@ -10,4 +10,4 @@
 /templates/firmwareinfotemplate.c 	text eol=lf
 /templates/gcs_version_info_template.h	text eol=crlf
 /templates/*.txt			text eol=crlf
-/templates/uncrustify.cfg		text eol=lf
+/uncrustify/*.cfg			text eol=lf
diff --git a/make/templates/uncrustify.cfg b/make/uncrustify/uncrustify.cfg
similarity index 100%
rename from make/templates/uncrustify.cfg
rename to make/uncrustify/uncrustify.cfg