diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca41b8287dba890cdeadabcf4886aa3f3308bfd2..625a619037d4b6281f7a80d93d16501092522305 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,20 @@ 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]
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
 ## [v0.6.0] - 2021-11-17
 (Timm Fitschen)
 
diff --git a/pom.xml b/pom.xml
index f9ecf89e6236921b21e670e3522927e2416eb8c5..d495e32de4989c90febb4e40dc731f0ff86a0d01 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.6.0</version>
+  <version>0.7.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>CaosDB Server</name>
   <scm>
diff --git a/src/doc/CHANGELOG.md b/src/doc/CHANGELOG.md
new file mode 120000
index 0000000000000000000000000000000000000000..699cc9e7b7c5bf63c3549abe36e3eecf8efab625
--- /dev/null
+++ b/src/doc/CHANGELOG.md
@@ -0,0 +1 @@
+../../CHANGELOG.md
\ No newline at end of file
diff --git a/src/doc/conf.py b/src/doc/conf.py
index 3e4e90e8c26fcc1fc709f20b82d06d21d2b5f787..ad278446b9c30d20d2664809db9ffc14039222f1 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.6'
+version = '0.7'
 # The full version, including alpha/beta/rc tags
-release = '0.6.0'
+release = '0.7.0-SNAPSHOT'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/src/doc/index.rst b/src/doc/index.rst
index 67a9e365f506009da21b3a6c00b771e751bf26c0..4f63fe07f37a4432a442040ff2f614f01c959472 100644
--- a/src/doc/index.rst
+++ b/src/doc/index.rst
@@ -14,6 +14,7 @@ Welcome to caosdb-server's documentation!
    administration
    Development <development/devel>
    Dependencies <DEPENDENCIES>
+   Changelog <CHANGELOG>
    specification/index.rst
    Glossary
    API documentation<_apidoc/packages>