diff --git a/.editorconfig b/.editorconfig
index 3ff654b59..178f43667 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,8 @@
-# To use this config on you editor, follow the instructions at:
+# To use this config on your editor, follow the instructions at:
 # http://editorconfig.org
 
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2018-2020 Collabora, Ltd. and the Monado contributors
+# SPDX-FileCopyrightText: 2018-2021 Collabora, Ltd. and the Monado contributors
 
 root = true
 
@@ -13,7 +13,7 @@ insert_final_newline = true
 [*.{c,h,cpp}]
 indent_style = tab
 indent_size = 8
-max_line_length = 80
+max_line_length = 120
 
 [*.py]
 indent_size = 4
diff --git a/src/xrt/.editorconfig b/src/xrt/.editorconfig
new file mode 100644
index 000000000..8746b3cb6
--- /dev/null
+++ b/src/xrt/.editorconfig
@@ -0,0 +1,10 @@
+# To use this config on your editor, follow the instructions at:
+# http://editorconfig.org
+
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2018-2021 Collabora, Ltd. and the Monado contributors
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true