diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..8538812
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,17 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = crlf
+insert_final_newline = true
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+[*.{c,h,cpp,hpp}]
+indent_style = space
+indent_size = 4
diff --git a/DmfBusFilterExtension.sln b/DmfBusFilterExtension.sln
index f1b2efb..a190ddc 100644
--- a/DmfBusFilterExtension.sln
+++ b/DmfBusFilterExtension.sln
@@ -7,6 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DmfBusFilterExtension", "sr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{93279664-7E33-4C94-8014-E754C9D0A831}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		DmfBusFilterExtension.props = DmfBusFilterExtension.props
 		LICENSE = LICENSE
 		README.md = README.md