diff --git a/devel/versions.sh b/devel/versions.sh
index 214d1fb9..e7d2aac8 100755
--- a/devel/versions.sh
+++ b/devel/versions.sh
@@ -2,8 +2,8 @@
 declare -A versions=(
     [c++utilities]=4.16.0
     [qtutilities]=5.12.1
-    [tagparser]=8.0.1
-    [tageditor]=3.1.2
+    [tagparser]=8.1.0
+    [tageditor]=3.1.3
     [passwordfile]=4.0.0
     [passwordmanager]=4.0.0
     [syncthingtray]=0.8.4
diff --git a/tageditor/default/PKGBUILD b/tageditor/default/PKGBUILD
index 48898c3f..6daae156 100644
--- a/tageditor/default/PKGBUILD
+++ b/tageditor/default/PKGBUILD
@@ -14,7 +14,7 @@ _json_export=${TAGEDITOR_JSON_EXPORT:-ON}
 
 _reponame=tageditor
 pkgname=tageditor
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska'
@@ -29,20 +29,8 @@ makedepends=('cmake' 'qt5-tools' 'mesa')
 [[ $_json_export == ON ]] && makedepends+=('reflective-rapidjson')
 checkdepends=('cppunit')
 url="https://github.com/Martchus/${_reponame}"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz"
-        '0001-Fix-building-tests-under-32-bit-Linux.patch')
-sha256sums=('0bb4092196051d44cd65a34b42186041ca82384ea1b159304ef81851be918e6a'
-            'ef7d081c335f9d80f00582685bb16acd72e50824d923e680e9a28cf341caa288')
-
-prepare() {
-  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-
-  # apply patches; further descriptions can be found in patch files itself
-  for patch in "$srcdir/"*.patch; do
-    msg2 "Applying patch $patch"
-    patch -p1 -i "$patch"
-  done
-}
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('d5bd68cb623c46ddfe1ee9286c0355ccf006e1b2ca3f7f44eb0fe41f4f3da6b6')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tageditor/mingw-w64-static/PKGBUILD b/tageditor/mingw-w64-static/PKGBUILD
index 2fa62a0a..39bf276c 100644
--- a/tageditor/mingw-w64-static/PKGBUILD
+++ b/tageditor/mingw-w64-static/PKGBUILD
@@ -15,7 +15,7 @@ _json_export=${TAGEDITOR_JSON_EXPORT:-ON}
 _reponame=tageditor
 pkgname=mingw-w64-tageditor-static
 _name=${_reponame}
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 arch=('any')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska'
@@ -30,7 +30,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-base-static' 'ming
 conflicts=("${pkgname%-static}")
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('0bb4092196051d44cd65a34b42186041ca82384ea1b159304ef81851be918e6a')
+sha256sums=('d5bd68cb623c46ddfe1ee9286c0355ccf006e1b2ca3f7f44eb0fe41f4f3da6b6')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/tageditor/mingw-w64-webview/PKGBUILD b/tageditor/mingw-w64-webview/PKGBUILD
index d82f708d..47373a41 100644
--- a/tageditor/mingw-w64-webview/PKGBUILD
+++ b/tageditor/mingw-w64-webview/PKGBUILD
@@ -17,7 +17,7 @@ pkgname=mingw-w64-tageditor-webview
 provides=('mingw-w64-tageditor')
 conflicts=('mingw-w64-tageditor')
 _name=${pkgname#mingw-w64-}
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 arch=('any')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska'
@@ -32,7 +32,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 [[ $_json_export == ON ]] && makedepends+=('mingw-w64-reflective-rapidjson')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('aab080768b3b7074218b0f8278fde4097c6ede29ba591fcd4ca68014af7ad7a5')
+sha256sums=('d5bd68cb623c46ddfe1ee9286c0355ccf006e1b2ca3f7f44eb0fe41f4f3da6b6')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/tageditor/mingw-w64/PKGBUILD b/tageditor/mingw-w64/PKGBUILD
index fb2c1026..20f745d0 100644
--- a/tageditor/mingw-w64/PKGBUILD
+++ b/tageditor/mingw-w64/PKGBUILD
@@ -15,7 +15,7 @@ _json_export=${TAGEDITOR_JSON_EXPORT:-ON}
 _reponame=tageditor
 pkgname=mingw-w64-tageditor
 _name=${pkgname#mingw-w64-}
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 arch=('any')
 pkgdesc='A tag editor with Qt GUI and command-line interface supporting MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska'
@@ -30,7 +30,7 @@ makedepends=('mingw-w64-gcc' 'mingw-w64-cmake' 'mingw-w64-qt5-tools' 'ffmpeg')
 [[ $_json_export == ON ]] && makedepends+=('mingw-w64-reflective-rapidjson')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('0bb4092196051d44cd65a34b42186041ca82384ea1b159304ef81851be918e6a')
+sha256sums=('d5bd68cb623c46ddfe1ee9286c0355ccf006e1b2ca3f7f44eb0fe41f4f3da6b6')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/tagparser/android-aarch64/PKGBUILD b/tagparser/android-aarch64/PKGBUILD
new file mode 100644
index 00000000..f82a3a4e
--- /dev/null
+++ b/tagparser/android-aarch64/PKGBUILD
@@ -0,0 +1,89 @@
+# Maintainer: Martchus <martchus@gmx.net>
+
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
+_reponame=tagparser
+_pkgname=tagparser
+_android_arch=arm64-v8a
+_pkg_arch=aarch64
+_android_toolchain=$_pkg_arch-linux-android
+_android_platform=22
+_prefix=/opt/android-libs/$_pkg_arch
+
+pkgname=android-$_pkg_arch-$_pkgname
+pkgver=8.1.0
+pkgrel=1
+arch=('any')
+pkgdesc="C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (Android, $_pkg_arch)"
+license=('GPL')
+depends=("android-$_pkg_arch-c++utilities")
+optdepends=("$_pkgname-doc: API documentation")
+checkdepends=("android-$_pkg_arch-cppunit" "android-$_pkg_arch-openssl")
+# FIXME: run tests with qemu
+#checkdepends+=('qemu-binfmt-arm' "android-$_pkg_arch-linker")
+makedepends=('cmake' 'android-ndk' 'android-sdk')
+#conflicts=("android-$_pkgname-$_android_arch")
+#replaces=("android-$_pkgname-$_android_arch")
+url="https://github.com/Martchus/${_reponame}"
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('abb96a898b67fda161aee5df325e772ff9a0f08502ecd482bf758cd323c009a3')
+options=(!buildflags staticlibs !strip !emptydirs)
+
+prepare() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+}
+
+build() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+
+  local android_sdk_path=${ANDROID_SDK_ROOT:-/opt/android-sdk}
+  local android_ndk_path=${ANDROID_NDK_ROOT:-/opt/android-ndk}
+  local include_dir=$_prefix/include
+
+  cmake \
+    -DCMAKE_SYSTEM_NAME=Android \
+    -DCMAKE_SYSTEM_VERSION=$_android_platform \
+    -DCMAKE_ANDROID_ARCH_ABI=$_android_arch \
+    -DCMAKE_ANDROID_SDK="$android_sdk_path" \
+    -DCMAKE_ANDROID_NDK="$android_ndk_path" \
+    -DCMAKE_ANDROID_STL_TYPE=c++_shared \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=$_prefix \
+    -DCMAKE_FIND_ROOT_PATH="$android_ndk_path/sysroot;$_prefix" \
+    -DCMAKE_EXE_LINKER_FLAGS="-Wl,-rpath-link,$_prefix/lib" \
+    -DNO_DOXYGEN=ON \
+    -Dcppunit_DYNAMIC_INCLUDE_DIR="$include_dir" \
+    -Dcppunit_STATIC_INCLUDE_DIR="$include_dir" \
+    -Dcppunit_DYNAMIC_LIB="$_prefix/lib/libcppunit-1.14.so" \
+    -Dcppunit_STATIC_LIB="$_prefix/lib/libcppunit.a"
+  make VERBOSE=1
+}
+
+check() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+
+  # can not run the tests so compile them at least
+  make tests VERBOSE=1
+
+  # FIXME: see c++utilities
+
+  #if [[ -z $TEST_FILE_PATH ]]; then
+  #  msg2 'Skipping execution of testsuite because the environment variable TEST_FILE_PATH is not set.'
+  #  return
+  #fi
+
+  #export LD_LIBRARY_PATH=$PWD:$prefix/lib:$android_ndk_path/sources/cxx-stl/llvm-libc++/libs/arm64-v8a:$android_ndk_path/platforms/android-28/arch-arm64/usr/lib
+  #make check VERBOSE=1
+}
+
+package() {
+  cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  # add tests to the package for possibly executing them later under Android
+  if [[ -f ${_pkgname}_tests ]]; then
+    mkdir "${pkgdir}/$_prefix/bin"
+    cp ${_pkgname}_tests "${pkgdir}/$_prefix/bin"
+  fi
+}
diff --git a/tagparser/default/PKGBUILD b/tagparser/default/PKGBUILD
index 5dcbfa84..244adf06 100644
--- a/tagparser/default/PKGBUILD
+++ b/tagparser/default/PKGBUILD
@@ -5,7 +5,7 @@
 
 _reponame=tagparser
 pkgname=tagparser
-pkgver=8.0.1
+pkgver=8.1.0
 pkgrel=1
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags'
@@ -16,7 +16,7 @@ checkdepends=('cppunit' 'openssl')
 optdepends=("$pkgname-doc: API documentation")
 url="https://github.com/Martchus/${_reponame}"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2dae626ed17c2dd8a0b673e12187ee4c8192e5c6967cf26b1c8ca6dd23992b30')
+sha256sums=('abb96a898b67fda161aee5df325e772ff9a0f08502ecd482bf758cd323c009a3')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tagparser/doc/PKGBUILD b/tagparser/doc/PKGBUILD
index 04440cfc..90c636af 100644
--- a/tagparser/doc/PKGBUILD
+++ b/tagparser/doc/PKGBUILD
@@ -6,7 +6,7 @@
 _name=tagparser
 _reponame=tagparser
 pkgname=$_name-doc
-pkgver=8.0.1
+pkgver=8.1.0
 pkgrel=1
 arch=('any')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (API documentation)'
@@ -14,7 +14,7 @@ license=('GPL')
 makedepends=('cmake' 'doxygen' 'dia' 'graphviz' 'c++utilities')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2dae626ed17c2dd8a0b673e12187ee4c8192e5c6967cf26b1c8ca6dd23992b30')
+sha256sums=('abb96a898b67fda161aee5df325e772ff9a0f08502ecd482bf758cd323c009a3')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
diff --git a/tagparser/mingw-w64/PKGBUILD b/tagparser/mingw-w64/PKGBUILD
index 8b5b787e..5d332eb7 100644
--- a/tagparser/mingw-w64/PKGBUILD
+++ b/tagparser/mingw-w64/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=tagparser
 pkgname=mingw-w64-tagparser
 _name=${pkgname#mingw-w64-}
-pkgver=8.0.1
+pkgver=8.1.0
 pkgrel=1
 arch=('any')
 pkgdesc='C++ library for reading and writing MP4/M4A/AAC (iTunes), ID3, Vorbis, Opus, FLAC and Matroska tags (mingw-w64)'
@@ -17,7 +17,7 @@ checkdepends=('mingw-w64-cppunit' 'mingw-w64-wine')
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('2dae626ed17c2dd8a0b673e12187ee4c8192e5c6967cf26b1c8ca6dd23992b30')
+sha256sums=('abb96a898b67fda161aee5df325e772ff9a0f08502ecd482bf758cd323c009a3')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'