diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..01bd19b39e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,21 @@
+# https://EditorConfig.org
+
+root = true
+
+[*]
+# charset = utf-8 # not system wide, just in the kernel
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+[*.{asm,inc}]
+indent_size = 8
+
+[kernel/**.{asm,inc}]
+charset = utf-8
+
+[*.{bat,cmd}]
+# Prefer Windows line endings
+end_of_line = crlf
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..668346f52f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+### Windows ###
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+### macOS ###
+.DS_Store
+._*