diff --git a/CHANGES.md b/CHANGES.md
index 99a0a3cb5..7acd8252a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
# Changelog
-## 6.0.0 (Unreleased)
+## 6.0.0 (2020-01-09)
- [enable_smacks](https://conversejs.org/docs/html/configuration.html#enable-smacks) is not set to `true` by default.
- Refactor some presence and status handling code from `converse-core` into `@converse/headless/converse-status`.
diff --git a/COPYRIGHT b/COPYRIGHT
index 85675a13c..3a55fd254 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@
*
* An XMPP chat client that runs in the browser.
*
- * Version: 5.0.4
+ * Version: 6.0.0
*
* Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies.
diff --git a/Makefile b/Makefile
index 619bf76a5..ac8f893ad 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ serve_bg: stamp-npm
dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js stamp-npm @converse/headless
npm run nodeps
-GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=5.0.4 dist/converse-no-dependencies.js -c
+GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=6.0.0 dist/converse-no-dependencies.js -c
.PHONY: pot
pot: dist/converse-no-dependencies.js
diff --git a/RELEASE.md b/RELEASE.md
index d2a1b062f..e6f29a07a 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,19 +1,18 @@
# Release checklist
1. Run `make check` to check that all tests pass.
-2. Decide on a version number, e.g. 6.0.0
-3. Run `make release VERSION=6.0.0`
-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"`
-8. Run `git push && git push --tags`
-9. Update https://conversejs.org
-10. Create `6.0.0` directory for the CDN.
+2. Run `make release VERSION=6.0.0`
+3. Do a `git diff` to check if things look sane.
+4. Do a quick manual test with the `dist` files (via `index.html`)
+5. `git commit -am "Release 6.0.0"`
+6. `git tag -s v6.0.0 -m "Release 6.0.0"`
+7. Run `git push && git push --tags`
+8. Update https://conversejs.org
+9. Create `6.0.0` directory for the CDN.
* `cd /home/conversejs/converse.js`
* `git clone --branch v6.0.0 git@github.com:conversejs/converse.js.git 6.0.0`
* `cd 6.0.0 && ASSET_PATH=https://cdn.conversejs.org/6.0.0/dist/ make dist`
* `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist`
-11. Run `npm publish && cd src/headless/ && npm publish`
-12. Update the repository on weblate
-13. Decide on next release number and run `make postrelease VERSION=6.0.1`
+10. Run `npm publish && cd src/headless/ && npm publish`
+11. Update the repository on weblate
+12. Decide on next release number and run `make postrelease VERSION=6.0.1`
diff --git a/demo/anonymous.html b/demo/anonymous.html
index 1c05c1d0f..3b1b62a58 100644
--- a/demo/anonymous.html
+++ b/demo/anonymous.html
@@ -9,13 +9,13 @@
-
-
+
+
-
-
+
+
diff --git a/demo/embedded.html b/demo/embedded.html
index b1a54078f..f58fe367e 100644
--- a/demo/embedded.html
+++ b/demo/embedded.html
@@ -9,12 +9,12 @@
-
+
-
-
+
+