diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..5dc46e6b3
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
\ No newline at end of file
diff --git a/bin/regen-protos.bat b/bin/regen-protos.bat
index 29f35d0ae..8edebcf7c 100644
--- a/bin/regen-protos.bat
+++ b/bin/regen-protos.bat
@@ -1 +1,5 @@
-cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated\meshtastic -I=..\protobufs meshtastic\*.proto
+cd protobufs && ..\nanopb-0.4.7\generator-bin\protoc.exe --nanopb_out=-v:..\src\mesh\generated -I=..\protobufs ..\protobufs\meshtastic\*.proto
+
+cd ../src/mesh/generated/meshtastic
+sed -i 's/#include "meshtastic/#include "./g' *
+sed -i 's/meshtastic_//g' *