diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7382b00bf..15254b87cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
 ## 0.20.1
 
 This release fixes an issue in the Docker image build. The
diff --git a/Makefile b/Makefile
index f83e1d667f..cce165445c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Use of this source code is governed by an Apache2
 # license that can be found in the LICENSE file.
 
-VERSION := 0.20.1
+VERSION := 0.21.0-dev
 
 CGO_ENABLED ?= 0