diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a12e0202f..7d37585794 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ Our versioning scheme is `YEAR.N` where `N` is incremented whenever a new releas
 
 ## [??? (unreleased)]
 
+
+## [2020.6] - 2020-04-30
+
 ### Added
 
 - libaktualizr API and aktualizr-primary command line parameter to provide custom hardware information in JSON format: [PR](https://github.com/advancedtelematic/aktualizr/pull/1644)
@@ -13,6 +16,14 @@ Our versioning scheme is `YEAR.N` where `N` is incremented whenever a new releas
 ### Changed
 
 - Improved garage-deploy object fetching performance by reusing the curl handle: [PR](https://github.com/advancedtelematic/aktualizr/pull/1643)
+- Added an SQL busy handler with 2 seconds timeout: [PR](https://github.com/advancedtelematic/aktualizr/pull/1648)
+- Improved internal exception handling: [PR #1654](https://github.com/advancedtelematic/aktualizr/pull/1654) and [PR #1658](https://github.com/advancedtelematic/aktualizr/pull/1658)
+
+### Fixed
+
+- Prevented more failure states from resulting in an installation loop: [PR #1632](https://github.com/advancedtelematic/aktualizr/pull/1632) and [PR #1635](https://github.com/advancedtelematic/aktualizr/pull/1635)
+- Allow installaton of 0-byte binary files: [PR](https://github.com/advancedtelematic/aktualizr/pull/1652)
+- Refuse to download OSTree targets with the fake/binary package manager: [PR](https://github.com/advancedtelematic/aktualizr/pull/1653)
 
 ### Removed
 
diff --git a/docs/README.adoc b/docs/README.adoc
index 8da85b6e50..4f92fb96e2 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -37,6 +37,7 @@ The link above is for the doxygen docs on master. Doxygen docs for the following
 * https://advancedtelematic.github.io/aktualizr/2020.3/index.html[2020.3]
 * https://advancedtelematic.github.io/aktualizr/2020.4/index.html[2020.4]
 * https://advancedtelematic.github.io/aktualizr/2020.5/index.html[2020.5]
+* https://advancedtelematic.github.io/aktualizr/2020.6/index.html[2020.6]
 ====
 
 == Release process
diff --git a/docs/ota-client-guide/antora.yml b/docs/ota-client-guide/antora.yml
index 10f514436c..e767d2647d 100644
--- a/docs/ota-client-guide/antora.yml
+++ b/docs/ota-client-guide/antora.yml
@@ -1,6 +1,6 @@
 name: ota-client
 title: OTA Connect Developer Guide
 version: latest
-display_version: 2020.5 (latest)
+display_version: 2020.6 (latest)
 nav:
 - modules/ROOT/nav.adoc
diff --git a/docs/ota-client-guide/modules/ROOT/pages/_partials/aktualizr-version.adoc b/docs/ota-client-guide/modules/ROOT/pages/_partials/aktualizr-version.adoc
index af7cf60494..f77f98cfd1 100644
--- a/docs/ota-client-guide/modules/ROOT/pages/_partials/aktualizr-version.adoc
+++ b/docs/ota-client-guide/modules/ROOT/pages/_partials/aktualizr-version.adoc
@@ -3,7 +3,7 @@
 // the version being viewed, but when we are referencing aktualizr from
 // the other, non-versioned docs, we want to make sure we're using the
 // latest version.
-:aktualizr-version: 2020.5
+:aktualizr-version: 2020.6
 
 :yocto-version: 3.0