diff --git a/appcast.xml b/appcast.xml
index 533d3a19a..8ae0b83d5 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -4,6 +4,20 @@
     <title>alt-tab-macos</title>
     <language>en</language>
 
+    <item>
+      <title>Version 6.18.0</title>
+      <pubDate>Sat, 13 Mar 2021 15:07:58 +0000</pubDate>
+      <sparkle:minimumSystemVersion>10.12</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>https://alt-tab-macos.netlify.app/changelog-bare</sparkle:releaseNotesLink>
+      <enclosure
+        url="https://github.com/lwouis/alt-tab-macos/releases/download/v6.18.0/AltTab-6.18.0.zip"
+        sparkle:version="6.18.0"
+        sparkle:shortVersionString="6.18.0"
+        sparkle:edSignature="t6ry/Aes3pjfbw56y0jHhKn13yTFvErQf0xQVNm8eKJodO1kM/+SqC/nphljwIVBJt8ing8/oKUM9S9eWdbxDQ==" length="7256939"
+        type="application/octet-stream"/>
+    </item>
+
+
     <item>
       <title>Version 6.17.0</title>
       <pubDate>Fri, 26 Feb 2021 03:03:42 +0000</pubDate>
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 4b67289c4..29dbe7580 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -1,5 +1,19 @@
 # Release notes
 
+# [6.18.0](https://github.com/lwouis/alt-tab-macos/compare/v6.17.0...v6.18.0) (2021-03-13)
+
+
+### Bug Fixes
+
+* more robust handling of custom shortcuts ([339aeaa](https://github.com/lwouis/alt-tab-macos/commit/339aeaa))
+* windows launched already fullscreen sometimes didn't show ([#824](https://github.com/lwouis/alt-tab-macos/issues/824)) ([62b43f2](https://github.com/lwouis/alt-tab-macos/commit/62b43f2))
+
+
+### Features
+
+* avoid disabling native command-tab (closes [#834](https://github.com/lwouis/alt-tab-macos/issues/834)) ([fb51c5d](https://github.com/lwouis/alt-tab-macos/commit/fb51c5d))
+* update contributors list ([5c7aa38](https://github.com/lwouis/alt-tab-macos/commit/5c7aa38))
+
 # [6.17.0](https://github.com/lwouis/alt-tab-macos/compare/v6.16.0...v6.17.0) (2021-02-26)