diff --git a/.editorconfig b/.editorconfig
index 85d4df20c..81787c6dd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,8 +7,8 @@
 # Top-most EditorConfig file.
 root = true
 
-[**/APKBUILD]
+[{**.{md,ini,sh,rules,nft},**/APKBUILD}]
 indent_style = tab
 end_of_line = lf
-insert_final_newline = true
 trim_trailing_whitespace = true
+insert_final_newline = true
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ece11967..ce3e34b5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,6 +61,15 @@ shellcheck:
   script:
     - .ci/shellcheck.sh
 
+editor-config:
+  stage: lint
+  <<: *only-default
+  image: alpine:edge
+  before_script:
+    - apk -q add editorconfig-checker
+  script:
+    - ec
+
 # aports checks (generic)
 aports-static:
   stage: lint