diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..f78e6ef
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf8
+end_of_line = lf
+indent_style = tab
+indent_size = 4
+insert_final_newline = true
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 9947be0..4f3ac48 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -91,7 +91,7 @@ notice:
  */
 
 When writing code, make sure lines never exceed 80 characters in width when
-using two-character-wide tabs.
+using four-character-wide indentation steps.
 
 For usage text and help messages, please do not implement a -h option. Just
 print usage information when any erroneous option is specified. Follow the