diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6757d2b
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,24 @@
+# http://editorconfig.org
+
+root = true
+
+# Follow Django conventions for most files
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Use 2 spaces for js and text(-like) files
+[*.{html,js,json,md,rst,txt,yml}]
+indent_size = 2
+
+# Makefiles always use tabs for indentation
+[Makefile]
+indent_style = tab
+
+# Batch files use tabs for indentation
+[*.bat]
+indent_style = tab
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..25d7e7b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,4 @@
+Djrill is maintained by its users. Your contributions are encouraged!
+
+Please see [Contributing](https://djrill.readthedocs.org/en/latest/contributing/)
+in the Djrill documentation for more information.