diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..942edecc
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*       text=auto
+*.[ch]  text whitespace=fix
+*.yaml  text whitespace=fix
diff --git a/Makefile b/Makefile
index 5c94702f..0e1fbe1f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,6 @@ clean:
 .PHONY: format
 format:
 	find . -iname *.h -o -iname *.c | xargs clang-format -i -style=file
-ifneq (,$(shell which dos2unix))
-	# TODO should we make this mandatory?
-	find . -iname *.h -o -iname *.c | xargs dos2unix -q
-endif
 
 .PHONY: tidy
 tidy: require_scheme