diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b1e9eeb6c..13160b801b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+5.8.2  (2020-05-12)
+------------------
+
+Fixed:
+* Core: Fix upscale cropping [#3079](https://github.com/forkcms/forkcms/pull/3079)
+* Core: Remove last slash in url after hreflang [#3080](https://github.com/forkcms/forkcms/pull/3080)
+* Core: Update composer packages [#3078](https://github.com/forkcms/forkcms/pull/3078) [#3077](https://github.com/forkcms/forkcms/pull/3077) [#3076](https://github.com/forkcms/forkcms/pull/3076)
+* Docs: Fix MailChimp Url [#3083](https://github.com/forkcms/forkcms/pull/3083)
+* Docs: Typo in Headline [#3082](https://github.com/forkcms/forkcms/pull/3082)
+* Docs: Update old docs link, with the new one [#3085](https://github.com/forkcms/forkcms/pull/3085)
+* Pages: Fix notice when deleting page [#3074](https://github.com/forkcms/forkcms/pull/3074)
+* Pages: Use single quotes for background images [#3067](https://github.com/forkcms/forkcms/pull/3067)
+
+Security:
+* Core: Bump jquery from 3.4.1 to 3.5.0 [#3089](https://github.com/forkcms/forkcms/pull/3089)
+
+
 5.8.1  (2020-04-17)
 ------------------
 Fixed:
diff --git a/VERSION.md b/VERSION.md
index 1802e771b4..5e21ca5a89 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-5.8.1
+5.8.2
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 2c3ddc7c51..ff0a8c746b 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       <debug-email>
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.8.1'
+    fork.version:           '5.8.2'
 
     session.cookie_secure:  false
     site.protocol:          <site-protocol>
diff --git a/app/config/parameters.yml.travis b/app/config/parameters.yml.travis
index 08d8a28329..4dcd179524 100644
--- a/app/config/parameters.yml.travis
+++ b/app/config/parameters.yml.travis
@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       ''
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.8.1'
+    fork.version:           '5.8.2'
 
     session.cookie_secure:  false
     site.protocol:          http
diff --git a/app/config/parameters_install.yml b/app/config/parameters_install.yml
index b8bcbc0246..66790b1a3b 100644
--- a/app/config/parameters_install.yml
+++ b/app/config/parameters_install.yml
@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       noreply@fork.com
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.8.1'
+    fork.version:           '5.8.2'
 
     session.cookie_secure:  false
     site.protocol:          <site-protocol>