diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000000000000000000000000000000000..817e87ab7d3b043048a79d999f8db6f19e940c8a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,32 @@
+# https://editorconfig.org/
+# https://github.com/editorconfig/editorconfig-vim
+# https://github.com/editorconfig/editorconfig-emacs
+
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_size = 4
+
+[*.rst]
+indent_size = 4
+
+[*.cpp]
+indent_size = 2
+
+[*.hpp]
+indent_size = 2
+
+# There may be one in doc/
+[Makefile]
+indent_style = tab
+
+# https://github.com/microsoft/vscode/issues/1679
+[*.md]
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 5d7ec910b474ff9bc163fc3c4d01c4ec65b7f0d8..117411d82547c4c31504f60b0d936c5df09a1ad2 100644
--- a/setup.py
+++ b/setup.py
@@ -26,6 +26,7 @@ setup(name="codepy",
       license="MIT",
 
       packages=["codepy", "codepy.cgen"],
+      python_requires="~=3.6",
       install_requires=[
           "pytools>=2015.1.2",
           "numpy>=1.6",