diff --git a/CHANGES.md b/CHANGES.md
index 18d29043c..db7f854b1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -4,13 +4,8 @@
 
 - #129: Add support for XEP-0156: Disovering Alternative XMPP Connection Methods. Only XML is supported for now.
 - #1105: Preliminary support for storing persistent data in IndexedDB instead of localStorage
-- #1089: When filtering the roster for `online` users, show all non-offline users.
 - #1691: Fix `collection.chatbox is undefined` errors
-- #1733: New message notifications for a minimized chat stack on top of each other
-- #1757: Chats are hidden behind the controlbox on mobile
-- #1760: Private messages no longer received after websocket reconnect
 - #1772: `_converse.api.contact.add(jid, nick)` fails, says not a function
-- Prevent editing of sent file uploads.
 - Initial support for sending custom emojis. Currently only between Converse
   instances. Still working out a wire protocol for compatibility with other clients.
   To add custom emojis, edit the `emojis.json` file.
@@ -45,6 +40,14 @@
   an integer for the `type`, "info", "warn" or "error" should be passed in.
 - The `converse-headline` plugin has been split up into `converse-headlines` and `converse-headlines-view`.
 
+## 5.0.5 (2019-11-20)
+
+- Prevent editing of sent file uploads.
+- #1089: When filtering the roster for `online` users, show all non-offline users.
+- #1733: New message notifications for a minimized chat stack on top of each other
+- #1757: Chats are hidden behind the controlbox on mobile
+- #1760: Private messages no longer received after websocket reconnect
+
 ## 5.0.4 (2019-10-08)
 
 - New config option [allow_message_corrections](https://conversejs.org/docs/html/configuration.html#allow-message-corrections)
diff --git a/RELEASE.md b/RELEASE.md
index f9e324e0e..d2a1b062f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -6,7 +6,7 @@
 4. Do a `git diff` to check if things look sane.
 5. Do a quick manual test with the `dist` files (via `index.html`)
 6. `git commit -am "Release 6.0.0"`
-7. `git tag -s v6.0.0 m "Release 6.0.0"`
+7. `git tag -s v6.0.0 -m "Release 6.0.0"`
 8. Run `git push && git push --tags`
 9. Update https://conversejs.org
 10. Create `6.0.0` directory for the CDN.