diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f23de85
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,16 @@
+# Exclude files and directories from Git archives (including Packagist)
+.github/ export-ignore
+docs/ export-ignore
+examples/ export-ignore
+tests/ export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.php-cs-fixer.dist.php export-ignore
+.releaserc.json export-ignore
+codecov.yml export-ignore
+commitlint.config.mjs export-ignore
+grumphp.yml.dist export-ignore
+phpunit*.xml* export-ignore
+phpstan.neon.dist export-ignore
+psalm.xml.dist export-ignore
+rector.php export-ignore
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ccf516a..349f66e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -38,7 +38,9 @@ jobs:
         uses: cycjimmy/semantic-release-action@v5
         id: semantic
         with:
+          # https://github.com/semantic-release/commit-analyzer/issues/65
           extra_plugins: |
+            semantic-release-unsquash@latest
             @semantic-release/changelog@latest
             @semantic-release/git@latest
             conventional-changelog-conventionalcommits@latest
diff --git a/.releaserc.json b/.releaserc.json
index 0c7ada1..b58ded9 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -7,8 +7,7 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
-    "@semantic-release/release-notes-generator",
+    "semantic-release-unsquash",
     [
       "@semantic-release/changelog",
       {
diff --git a/composer.json b/composer.json
index 7e47794..ef85392 100644
--- a/composer.json
+++ b/composer.json
@@ -77,23 +77,5 @@
         "security": "@check --tasks=securitychecker_roave",
         "test": "@check --tasks=phpunit",
         "test:coverage": "vendor/bin/phpunit --coverage-clover=coverage.xml"
-    },
-    "archive": {
-        "exclude": [
-            ".github/*",
-            "docs/*",
-            "examples/*",
-            "tests/*",
-            ".gitignore",
-            ".php-cs-fixer.dist.php",
-            ".releaserc.json",
-            "codecov.yml",
-            "commitlint.config.mjs",
-            "grumphp.yml.dist",
-            "phpunit*.xml*",
-            "phpstan.neon.dist",
-            "psalm.xml.dist",
-            "rector.php"
-        ]
     }
 }