diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..ee63547
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_brace_style = K&R
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+
diff --git a/.gitignore b/.gitignore
index b3f5eb3..3a612b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /target
 /Cargo.lock
 .vagrant
+*.swp