diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbb4a8f3c..9341e1c32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Change Log
 
+## v6.0.0 - 2018-12-16
+
+v6.0.0 release version. Mainly includes  fixes for regressions from the beta version. 
+
+This release had contributions from 5 people: @rauchy, @denisov-vlad, @arikfr, @ariarijp, and @gabrieldutra. Thank you, everyone 🙏
+
+### Changed
+
+* #3183 Make refresh_queries less noisey in logs. @arikfr
+
+### Fixed
+
+* #3163 Include correct version in production builds. @rauchy
+* #3161 Clickhouse: fix int() conversion error. @denisov-vlad
+* #3166 Directly using record_event task requires timestamp. @arikfr
+* #3167 Alert.evaluate failing when the column is missing. @arikfr
+* ##3162 Remove API permissions for users who have been disabled. @rauchy
+* #3171 Reject empty query name. @ariarijp
+* #3175, #3186 Fix disable error message. @rauchy, @gabrieldutra
+* #3182 [Redshift] support for schema names with dots. @arikfr
+* #3187 Safely create_app in Celery code (try to fetch current_app first). @arikfr
+
+### Other
+
+* #3155 Add DB Seed to Cypress and setup Percy. @gabrieldutra
+* #3180 Remove coverage from pytest terminal output. @rauchy
+
+
 ## v6.0.0-beta - 2018-12-03
 
 This release was 2 months in the making and it is full with good stuff! 
diff --git a/package-lock.json b/package-lock.json
index 40e22e638..3780bd309 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "6.0.0-beta",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a2fa98139..565de8fd4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "6.0.0-beta",
+  "version": "6.0.0",
   "description": "The frontend part of Redash.",
   "main": "index.js",
   "scripts": {
diff --git a/redash/__init__.py b/redash/__init__.py
index e076eef14..942550908 100644
--- a/redash/__init__.py
+++ b/redash/__init__.py
@@ -18,7 +18,7 @@ from redash.query_runner import import_query_runners
 from redash.destinations import import_destinations
 
 
-__version__ = '6.0.0-beta'
+__version__ = '6.0.0'
 
 
 def setup_logging():
@@ -148,4 +148,4 @@ def safe_create_app():
     if current_app:
         return current_app
 
-    return create_app()
\ No newline at end of file
+    return create_app()