diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..bb0828b7a3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# This file provide reference settings for the Pymavlink code conventions
+# There are plug-ins available for nearly every text editor to automatically
+# respect the conventions contained within this file.
+#
+# Please see editorconfig.org for complete information.
+#
+# If you find errors in this file, please send a pull-request with a fix.
+#
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false # These are the correct rules for coding standards, but fixing up old files causes git spam
+insert_final_newline = false
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..9694e13a2f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,11 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+text eol=lf
+
+# Declare files that will always have LF line endings on checkout.
+*.py text eol=lf
+*.sh text eol=lf
+*.bash text eol=lf
+
+*.bin -diff
+
+*.bin binary linguist-generated