diff --git a/CHANGELOG.md b/CHANGELOG.md
index e79c06624c1929c5b334e694c20b520d42630640..9c980ba7dabba33308a0b7e6d7f41b6e13ece97c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,21 +10,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Renamed the person reference resolver.
-
 ### Deprecated
 
 ### Removed
 
 ### Fixed
 
-* [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)
-  Autocompletion for "IS REFERENCED BY" leads to query syntax error
-
 ### Security
 
 ### Documentation
 
+## [0.6.0] - 2022-05-03
+(Daniel Hornung)
+
+### Changed
+
+* Renamed the person reference resolver.
+
+### Fixed
+
+* [webui#170](https://gitlab.com/caosdb/caosdb-webui/-/issues/170)
+  Autocompletion for "IS REFERENCED BY" leads to query syntax error
+
 ## [0.5.0] - 2022-03-25
 (Timm Fitschen)
 
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index f0856c6ad63d9d3a6720705a264d4f13482954a5..f3dc40b40e9022907e5dbeab20b5c4bb7395c48e 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -18,7 +18,7 @@ guidelines of the CaosDB Project
 
 2. Check all general prerequisites.
 
-3. update src/doc/conf.py version
+3. Update `src/doc/conf.py` version
 
 4. Merge the release branch into the main branch.
 
@@ -28,4 +28,6 @@ guidelines of the CaosDB Project
 
 7. Merge the main branch back into the dev branch.
 
-8. Prepare CHANGELOG for next release cycle.
+8. Prepare for next release cycle:
+   * `CHANGELOG.md`: "Unreleased" section
+   * `src/doc/conf.py`: Bump to next version number and `x.y.z-SNAPSHOT` for the `release` variable.
diff --git a/src/doc/conf.py b/src/doc/conf.py
index aea5a41d54b32886bfdbd79882bca2aa2ee51eb4..a9b28b9305b67cb552a5f279b4ef2f330ee7929c 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -22,13 +22,13 @@
 import sphinx_rtd_theme
 
 project = 'caosdb-webui'
-copyright = '2020, IndiScale GmbH'
+copyright = '2022, IndiScale GmbH'
 author = 'Daniel Hornung'
 
 # The short X.Y version
-version = '0.6.0'
+version = '0.6.1'
 # The full version, including alpha/beta/rc tags
-release = '0.6.0-SNAPSHOT'
+release = '0.6.1-SNAPSHOT'
 
 
 # -- General configuration ---------------------------------------------------