diff --git a/NEWS b/NEWS
index a597a4b82..1c514b8dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.21.18 (not yet released)
+
 ver 0.21.17 (2019/12/16)
 * protocol
   - relax the ISO 8601 parser: allow omitting field separators, the
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 80fa55394..5b9f57b60 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="40"
-          android:versionName="0.21.17">
+          android:versionCode="41"
+          android:versionName="0.21.18">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 
diff --git a/doc/conf.py b/doc/conf.py
index 4fb8560fa..c494a9cf2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.21.17'
+version = '0.21.18'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/meson.build b/meson.build
index 93952164d..597989b0a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.17',
+  version: '0.21.18',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',