diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..75fc9b71
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Shell scripts need Unix line endings (see https://github.com/gbdev/rgbds/issues/841)
+*.sh text eol=lf
diff --git a/.github/workflows/create-release-artifacts.yaml b/.github/workflows/create-release-artifacts.yaml
index ed4c9543..dc894f99 100644
--- a/.github/workflows/create-release-artifacts.yaml
+++ b/.github/workflows/create-release-artifacts.yaml
@@ -8,9 +8,6 @@ jobs:
   windows:
     runs-on: windows-2019
     steps:
-      - name: Disable auto-CRLF # This breaks scripts (see https://github.com/gbdev/rgbds/issues/841)
-        run: |
-          git config --global --unset core.autocrlf
       - uses: actions/checkout@v2
       - name: Get version from tag
         shell: bash