diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cc8832048557c49068fdf498ff6e88efbc1da2c..ab1f09f09dbc7d324e52055503545a4677fc0d40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,25 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [v0.6.0] - 2021-11-17
+(Timm Fitschen)
 
 ### Added
 
+* Endpoint for CaosDB GRPC API 0.1 (see https://gitlab.com/caosdb-proto.git for
+  more).
+  Authentication is supported via a Basic scheme, using the well-known
+  "authentication" header.
+  Notable limitations of the current implementation of the API:
+  * It is currently not possible to mix retrievals
+    (caosdb.entity.v1.RetrieveRequest) with any other transaction type - so
+    transaction are either read-only or write-only. The server throws an error
+    if it finds mixed read/write transactions.
+  * It is currently not possible to have more that one query
+    (caosdb.entity.v1.Query) in a single transaction. The server throws an
+    error if it finds more than one query.
+
+
 ### Changed
 
 ### Deprecated
diff --git a/pom.xml b/pom.xml
index a2436f11e556d85f331e103ca8caa63ee59e186d..f9ecf89e6236921b21e670e3522927e2416eb8c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.caosdb</groupId>
   <artifactId>caosdb-server</artifactId>
-  <version>0.5.1-GRPC0.1.0</version>
+  <version>0.6.0</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>
diff --git a/src/doc/conf.py b/src/doc/conf.py
index 4e5ff81b4175032fa9bfeb759d8258621cec4be2..3e4e90e8c26fcc1fc709f20b82d06d21d2b5f787 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -25,9 +25,9 @@ copyright = '2020, IndiScale GmbH'
 author = 'Daniel Hornung'
 
 # The short X.Y version
-version = '0.5.1'
+version = '0.6'
 # The full version, including alpha/beta/rc tags
-release = '0.5.1-GRPC0.1.0'
+release = '0.6.0'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java b/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java
index 7966251c101cc42d948b343648013f19ba8cdb60..17d9f4c8e17886f66bc73096487f0b194b350fe8 100644
--- a/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java
+++ b/src/main/java/org/caosdb/server/grpc/GeneralInfoServiceImpl.java
@@ -48,7 +48,7 @@ public class GeneralInfoServiceImpl extends GeneralInfoServiceImplBase {
     final Integer major = Integer.parseInt(version[0]);
     final Integer minor = Integer.parseInt(version[1]);
     final Integer patch = Integer.parseInt(version[2]);
-    final String pre_release = version.length > 3 ? version[3] : null;
+    final String pre_release = version.length > 3 ? version[3] : "";
     final String build = CaosDBServer.getServerProperty(ServerProperties.KEY_PROJECT_REVISTION);
 
     final VersionInfo versionInfo =