diff --git a/README.md b/README.md
index 37a52b93..fba0f9a4 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Simple bridge between mattermost, IRC, XMPP and Gitter
 Look at [matterbridge.conf.sample] (https://github.com/42wim/matterbridge/blob/master/matterbridge.conf.sample) for documentation and an example.
 
 ## Changelog
-Since v0.6.0-beta support for XMPP and Gitter is added. More details in [changelog.md] (https://github.com/42wim/matterbridge/blob/master/changelog.md)
+Since v0.6.0 support for XMPP, Gitter and Slack is added. More details in [changelog.md] (https://github.com/42wim/matterbridge/blob/master/changelog.md)
 
 ## Requirements:
 Accounts to one of the supported bridges
@@ -20,7 +20,7 @@ Accounts to one of the supported bridges
 
 ## binaries
 Binaries can be found [here] (https://github.com/42wim/matterbridge/releases/)
-* For use with mattermost 3.3.0 [v0.6.0-beta1](https://github.com/42wim/matterircd/releases/tag/v0.6.0-beta1)
+* For use with mattermost 3.3.0+ [v0.6.0](https://github.com/42wim/matterircd/releases/tag/v0.6.0)
 * For use with mattermost 3.0.0-3.2.0 [v0.5.0](https://github.com/42wim/matterircd/releases/tag/v0.5.0)
 
 ## Compatibility
diff --git a/changelog.md b/changelog.md
index 8e0894c4..7bd84453 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,12 @@
+# v0.6.0
+## New features
+* Slack support added.  See matterbridge.conf.sample for more information
+## Bugfix
+* Fix 100% CPU bug on incorrect closed connections
+
 # v0.6.0-beta2
 ## New features
-* Gitter support added. See matterbridge.conf.sample for more information
+* Gitter support added.  See matterbridge.conf.sample for more information
 
 # v0.6.0-beta1
 ## Breaking changes from 0.5 to 0.6
diff --git a/matterbridge.go b/matterbridge.go
index a606a3bc..90127539 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -8,7 +8,7 @@ import (
 	log "github.com/Sirupsen/logrus"
 )
 
-var version = "0.6.0-beta2"
+var version = "0.6.0"
 
 func init() {
 	log.SetFormatter(&log.TextFormatter{FullTimestamp: true})