diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22b0d5d96..1782ad0e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # CHANGELOG - sitespeed.io
 
-## UNRELEASED 6.0 ALPHA
+## 6.0.0 2017-11-24
 
-We plan to release 6.0 sometimes after Firefox 57 is released (November 14?). Before you upgrade, please read our [upgrade guide](https://www.sitespeed.io/documentation/sitespeed.io/upgrade/).
+Before you upgrade, please read our [upgrade guide](https://www.sitespeed.io/documentation/sitespeed.io/upgrade/).
 
 ### Added
 * Use Chartist to display visual progress and size/requests to make it easier for users [#1659](https://github.com/sitespeedio/sitespeed.io/pull/1659).
diff --git a/README.md b/README.md
index 781b4cf68..7db4939f3 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 
 ## Welcome to the wonderful world of web performance!
 
-*IMPORTANT*: Master is now the coming 6.0. If you need to a patch release, use the [5.x branch](https://github.com/sitespeedio/sitespeed.io/tree/5.x). 6.0 is going to be released sometimes after Firefox 57.
+We have worked a lot on our documentation so you should head over to [https://www.sitespeed.io/documentation/sitespeed.io/](https://www.sitespeed.io/documentation/sitespeed.io/) and read what you can do with sitespeed.io.
 
 Using sitespeed.io you can:
 * Test your web site against Web Performance best practices using the [Coach](https://github.com/sitespeedio/coach).
@@ -23,7 +23,7 @@ Using sitespeed.io you can:
 
 See all the latest changes in the [Changelog](https://github.com/sitespeedio/sitespeed.io/blob/master/CHANGELOG.md).
 
-If you use Firefox 55 (or later) please have a look at https://github.com/sitespeedio/browsertime/issues/358. When 57 is released we think there will be a easy way to fix it :)
+If you use Firefox 55 (or later) please have a look at https://github.com/sitespeedio/browsertime/issues/358. We are waiting on the new extension from Mozilla to be able to export the HAR.
 
 ## Examples of what you can do
 
@@ -47,7 +47,7 @@ Video - easiest using Docker. This gif is optimized, the quality is much better
 Using Docker (requires 1.10+):
 
 ```bash
-$ docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io --video --speedIndex https://www.sitespeed.io/
+$ docker run --shm-size=1g --rm -v "$(pwd)":/sitespeed.io sitespeedio/sitespeed.io https://www.sitespeed.io/
 ```
 
 Or install using npm: