diff --git a/.travis.yml b/.travis.yml
index bcf1e5b9d..c349c993c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,50 @@ matrix:
       env:
         - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
 
+    # Ubuntu Bionic (18.04) with GCC 7 on big-endian
+    - os: linux
+      arch: s390x
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
+    # Ubuntu Bionic (18.04) with GCC 7 on ARM64
+    - os: linux
+      arch: arm64
+      dist: bionic
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:deadsnakes/ppa' # for Python 3.7 (required by Meson)
+          packages:
+            - libgtest-dev
+            - libboost-dev
+            - python3.6
+            - python3-urllib3
+            - ninja-build
+      before_install:
+        - wget https://bootstrap.pypa.io/get-pip.py
+        - /usr/bin/python3.6 get-pip.py --user
+      install:
+        - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
+      env:
+        - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
+
     # Ubuntu Trusty (16.04) with GCC 6
     - os: linux
       dist: trusty
diff --git a/NEWS b/NEWS
index 0b7be51e1..9abdae646 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,9 @@ ver 0.22 (not yet released)
 * switch to C++17
   - GCC 7 or clang 4 (or newer) recommended
 
+ver 0.21.19 (not yet released)
+* fix build failure with clang 10
+
 ver 0.21.18 (2019/12/24)
 * protocol
   - work around Mac OS X bug in the ISO 8601 parser
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 5b9f57b60..d1bcefc02 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="41"
-          android:versionName="0.21.18">
+          android:versionCode="42"
+          android:versionName="0.21.19">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26"/>
 
diff --git a/src/util/Compiler.h b/src/util/Compiler.h
index 57a464a6e..5c819d997 100644
--- a/src/util/Compiler.h
+++ b/src/util/Compiler.h
@@ -145,7 +145,7 @@
 
 #if GCC_CHECK_VERSION(7,0)
 #define gcc_fallthrough __attribute__((fallthrough))
-#elif CLANG_CHECK_VERSION(10,0)
+#elif CLANG_CHECK_VERSION(10,0) && defined(__cplusplus)
 #define gcc_fallthrough [[fallthrough]]
 #else
 #define gcc_fallthrough