diff --git a/NEWS b/NEWS
index 3e1e32a25..3962becb1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.21.17 (not yet released)
+
 ver 0.21.16 (2019/10/16)
 * queue
   - fix relative destination offset when moving a range
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e6bf686a9..80fa55394 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="39"
-          android:versionName="0.21.16">
+          android:versionCode="40"
+          android:versionName="0.21.17">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 
diff --git a/doc/conf.py b/doc/conf.py
index 660300aa7..4fb8560fa 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.16'
+version = '0.21.17'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/meson.build b/meson.build
index df45a688b..8c04c0574 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.16',
+  version: '0.21.17',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',