diff --git a/NEWS b/NEWS
index 101a26424..daac3aef0 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,8 @@ ver 0.23 (not yet released)
   - new tags "ComposerSort", "Ensemble", "Movement", "MovementNumber", and "Location"
 * new build-time dependency: libfmt
 
+ver 0.22.9 (not yet released)
+
 ver 0.22.8 (2021/05/22)
 * fix crash bug in "albumart" command (0.22.7 regression)
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index ca4591b97..36e636804 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="56"
-          android:versionName="0.22.8">
+          android:versionCode="57"
+          android:versionName="0.22.9">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
diff --git a/meson.build b/meson.build
index 9c1039bf7..b7be517dd 100644
--- a/meson.build
+++ b/meson.build
@@ -118,7 +118,10 @@ if get_option('buildtype') != 'debug'
 endif
 
 if get_option('fuzzer')
-  fuzzer_flags = ['-fsanitize=fuzzer,address,undefined']
+  fuzzer_flags = ['-fsanitize=fuzzer']
+  if get_option('b_sanitize') == 'none'
+    fuzzer_flags += ['-fsanitize=address,undefined']
+  endif
   add_global_arguments(fuzzer_flags, language: 'cpp')
   add_global_arguments(fuzzer_flags, language: 'c')
   add_global_link_arguments(fuzzer_flags, language: 'cpp')
diff --git a/src/util/RuntimeError.hxx b/src/util/RuntimeError.hxx
index 962bad67b..74cb8a5de 100644
--- a/src/util/RuntimeError.hxx
+++ b/src/util/RuntimeError.hxx
@@ -35,7 +35,7 @@
 
 #include <stdio.h>
 
-#ifdef __clang__
+#if defined(__clang__) || defined(__GNUC__)
 #pragma GCC diagnostic push
 // TODO: fix this warning properly
 #pragma GCC diagnostic ignored "-Wformat-security"
@@ -59,7 +59,7 @@ FormatInvalidArgument(const char *fmt, Args&&... args) noexcept
 	return std::invalid_argument(buffer);
 }
 
-#ifdef __clang__
+#if defined(__clang__) || defined(__GNUC__)
 #pragma GCC diagnostic pop
 #endif