diff --git a/NEWS b/NEWS
index 9cfeb1115..90eb2286e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.21.8 (not yet released)
+
 ver 0.21.7 (2019/04/03)
 * input
   - qobuz/tidal: scan tags when loading a playlist
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e2672f984..ba343453d 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="29"
-          android:versionName="0.21.7">
+          android:versionCode="30"
+          android:versionName="0.21.8">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 
diff --git a/doc/conf.py b/doc/conf.py
index 426eb731b..bf7b60eb0 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.7'
+version = '0.21.8'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/meson.build b/meson.build
index 203191c80..466d1149d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.21.7',
+  version: '0.21.8',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c99',