diff --git a/.editorconfig b/.editorconfig
index 0f4e36dcdc70f..a4baa4b4c80b0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,3 +13,11 @@ trim_trailing_whitespace = true
 
 [.git/COMMIT*]
 max_line_length = 72
+
+[{osdep/dirent-win.h,TOOLS/osxbundle/mpv.app/Contents/PkgInfo}]
+charset = unset
+insert_final_newline = unset
+indent_style = unset
+indent_size = unset
+max_line_length = unset
+trim_trailing_whitespace = unset
diff --git a/.editorconfig-checker.json b/.editorconfig-checker.json
new file mode 100644
index 0000000000000..1cedd44ffef9c
--- /dev/null
+++ b/.editorconfig-checker.json
@@ -0,0 +1,7 @@
+{
+    "Format": "github-actions",
+    "Disable": {
+        "IndentSize": true,
+        "MaxLineLength": true
+    }
+}
diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
index 6c721d51133d0..44eaa85fc97b6 100644
--- a/.github/PULL_REQUEST_TEMPLATE
+++ b/.github/PULL_REQUEST_TEMPLATE
@@ -2,4 +2,4 @@ Read this before you submit this pull request:
 https://github.com/mpv-player/mpv/blob/master/DOCS/contribute.md
 
 Reading this link and following the rules will get your pull request reviewed
-and merged faster. Nobody wants lazy pull requests.
\ No newline at end of file
+and merged faster. Nobody wants lazy pull requests.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3aece2f4d71b1..06515adcabae4 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -39,3 +39,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: chartboost/ruff-action@v1
+
+  editorconfig-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: editorconfig-checker/action-editorconfig-checker@main
+      - run: editorconfig-checker -config .editorconfig-checker.json