diff --git a/CHANGES.md b/CHANGES.md
index 245974f54..8f4f5ca87 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 6.0.1 (Unreleased)
+## 6.0.1 (2020-02-13)
 
 - Bugfix. Handle stanza that clears the MUC subject
 - #1313: Stylistic improvements to the send button
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a55fd254..05b337c6c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@
  *
  *  An XMPP chat client that runs in the browser.
  *
- *  Version: 6.0.0
+ *  Version: 6.0.1
  *
  *  Copyright: JC Brand 2013-2018
  *  Except for 3rd party dependencies.
diff --git a/Makefile b/Makefile
index ac8f893ad..fbde0e503 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=6.0.0 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.1 dist/converse-no-dependencies.js -c
 
 .PHONY: pot
 pot: dist/converse-no-dependencies.js
diff --git a/demo/anonymous.html b/demo/anonymous.html
index 3b1b62a58..75141b919 100644
--- a/demo/anonymous.html
+++ b/demo/anonymous.html
@@ -9,13 +9,13 @@
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="../images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/font-awesome.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/website.min.css" />
     <script type="text/javascript" src="../analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gt IE 11]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
-        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
+        <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
     <![endif]>
 </head>
 
diff --git a/demo/embedded.html b/demo/embedded.html
index f58fe367e..bd51fefff 100644
--- a/demo/embedded.html
+++ b/demo/embedded.html
@@ -9,12 +9,12 @@
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="../images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/website.min.css" />
     <script type="text/javascript" src="/analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 11]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
-        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
+        <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
     <![endif]>
     <style>
         .converse-container {
diff --git a/demo/index.html b/demo/index.html
index 73e3bb9b2..828233440 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -14,8 +14,8 @@
     <script type="text/javascript" src="/analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 9]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
-        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
+        <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
     <![endif]>
 </head>
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3c05af6fc..6cfd507fa 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '6.0.0'
+version = '6.0.1'
 # The full version, including alpha/beta/rc tags.
-release = '6.0.0'
+release = '6.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst
index 9ec87fcf5..40a8059fa 100644
--- a/docs/source/quickstart.rst
+++ b/docs/source/quickstart.rst
@@ -58,16 +58,16 @@ might break when a new backwards-incompatible version of Converse is released.
 
 To load a specific version of Converse you can put the version in the URL:
 
-* https://cdn.conversejs.org/6.0.0/dist/converse.min.js
-* https://cdn.conversejs.org/6.0.0/dist/converse.min.css
+* https://cdn.conversejs.org/6.0.1/dist/converse.min.js
+* https://cdn.conversejs.org/6.0.1/dist/converse.min.css
 
 You can include these two URLs inside the *<head>* element of your website
 via the *script* and *link* tags:
 
 .. code-block:: html
 
-    <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css">
-    <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js" charset="utf-8"></script>
+    <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css">
+    <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js" charset="utf-8"></script>
 
 
 Option 2: Download the builds from Github
diff --git a/fullscreen.html b/fullscreen.html
index 2d87fcfaf..4bc65e53d 100644
--- a/fullscreen.html
+++ b/fullscreen.html
@@ -7,13 +7,13 @@
     <meta name="description" content="Converse XMPP/Jabber Chat"/>
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
-    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
+    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.1/dist/favicon.ico"/>
     <script type="text/javascript" src="inverse-analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=5" style="border:0;" alt="" /></p></noscript>
     <link rel="manifest" href="./manifest.json">
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
     <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
-    <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+    <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
 </head>
 <body class="converse-fullscreen">
 <noscript>You need to enable JavaScript to run the Converse.js chat app.</noscript>
diff --git a/index.html b/index.html
index 523be95cc..09a0fe733 100644
--- a/index.html
+++ b/index.html
@@ -10,17 +10,17 @@
     <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
 
     <!-- These files are NOT needed when using converse.js in your own project. -->
-    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
+    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.1/dist/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/website.min.css" />
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <script type="text/javascript" src="/src/website.js"></script>
     <script type="text/javascript" src="analytics.js"></script>
     <!-- *********************************************************************** -->
 
     <link rel="manifest" href="./manifest.json">
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
     <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
-    <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+    <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
 </head>
 
 <body id="page-top" data-spy="scroll" class="converse-website">
diff --git a/jslicenses.html b/jslicenses.html
index 345dcebc7..1d33af331 100644
--- a/jslicenses.html
+++ b/jslicenses.html
@@ -11,17 +11,17 @@
 
     <!-- These files are NOT needed when using converse.js in your own project. -->
     <link rel="shortcut icon" type="image/ico" href="images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/font-awesome.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/website.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/css/website.min.css" />
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <script type="text/javascript" src="/src/website.js"></script>
     <script type="text/javascript" src="analytics.js"></script>
     <!-- *********************************************************************** -->
 
     <![if gte IE 11]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/converse.min.css" />
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/css/converse.min.css" />
         <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
-        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+        <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
     <![endif]>
 </head>
 
@@ -66,7 +66,7 @@
             <table id="jslicense-labels1" style="width: 100%">
                 <tr>
                     <td>
-                        <a href="https://cdn.conversejs.org/6.0.0/dist/converse.min.js">converse.min.js</a>
+                        <a href="https://cdn.conversejs.org/6.0.1/dist/converse.min.js">converse.min.js</a>
                     </td>
                     <td>
                         <a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a>
diff --git a/mobile.html b/mobile.html
index bf040e01d..19678b564 100644
--- a/mobile.html
+++ b/mobile.html
@@ -18,9 +18,9 @@
     <script type="text/javascript" src="analytics.js"></script>
     <!-- *********************************************************************** -->
 
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
     <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
-    <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
+    <script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
 </head>
 
 <body id="page-top" data-spy="scroll" class="converse-website">
diff --git a/package-lock.json b/package-lock.json
index f4650b8ae..c11f28236 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "converse.js",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -17100,13 +17100,13 @@
 			"dev": true
 		},
 		"twemoji": {
-			"version": "12.1.4",
-			"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-12.1.4.tgz",
-			"integrity": "sha512-e37lUlVijmABF7wPCc09s1kKj3hcpzU8KL5zw2bBDIXOtOr4luLF+ODJaEqca8dZPmLR5ezrJYI93nhPovKBiQ==",
+			"version": "12.1.5",
+			"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-12.1.5.tgz",
+			"integrity": "sha512-B0PBVy5xomwb1M/WZxf/IqPZfnoIYy1skXnlHjMwLwTNfZ9ljh8VgWQktAPcJXu8080WoEh6YwQGPVhDVqvrVQ==",
 			"requires": {
 				"fs-extra": "^8.0.1",
 				"jsonfile": "^5.0.0",
-				"twemoji-parser": "12.1.1",
+				"twemoji-parser": "12.1.3",
 				"universalify": "^0.1.2"
 			},
 			"dependencies": {
@@ -17122,9 +17122,9 @@
 			}
 		},
 		"twemoji-parser": {
-			"version": "12.1.1",
-			"resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-12.1.1.tgz",
-			"integrity": "sha512-XFUB4ReEvPbNPtiuyo/+crM4RldYbRRAhyE7Hw6EnfBdXECGydw7a49EGADayRvaeierP/m4DSv/OZQObh0LGA=="
+			"version": "12.1.3",
+			"resolved": "https://registry.npmjs.org/twemoji-parser/-/twemoji-parser-12.1.3.tgz",
+			"integrity": "sha512-ND4LZXF4X92/PFrzSgGkq6KPPg8swy/U0yRw1k/+izWRVmq1HYi3khPwV3XIB6FRudgVICAaBhJfW8e8G3HC7Q=="
 		},
 		"type-check": {
 			"version": "0.3.2",
diff --git a/package.json b/package.json
index e586e6812..176f1ee51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Browser based XMPP chat client",
   "browser": "dist/converse.js",
   "module": "src/converse.js",
diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js
index 0732ba667..f0da8874b 100644
--- a/src/headless/converse-core.js
+++ b/src/headless/converse-core.js
@@ -113,7 +113,7 @@ const _converse = {
     'promises': {}
 }
 
-_converse.VERSION_NAME = "v6.0.1dev";
+_converse.VERSION_NAME = "v6.0.1";
 
 Object.assign(_converse, Backbone.Events);
 
diff --git a/src/headless/package.json b/src/headless/package.json
index aacb0980d..d081d3859 100644
--- a/src/headless/package.json
+++ b/src/headless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@converse/headless",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Converse.js Headless build",
   "author": "cmrd Senya <senya@riseup.net>",
   "homepage": "https://conversejs.org",