diff --git a/extra/vbam/.SRCINFO b/extra/vbam/.SRCINFO
index 59e52bfb8..83d6e10fe 100644
--- a/extra/vbam/.SRCINFO
+++ b/extra/vbam/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = vbam
 	pkgdesc = Nintendo GameBoy Advance emulator
 	pkgver = 2.1.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://visualboyadvance-m.org
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
-	makedepends = doctest
 	makedepends = ffmpeg
 	makedepends = git
 	makedepends = libglvnd
diff --git a/extra/vbam/PKGBUILD b/extra/vbam/PKGBUILD
index f641122e3..8090ba8ca 100644
--- a/extra/vbam/PKGBUILD
+++ b/extra/vbam/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
 # Maintainer: T.J. Townsend <blakkheim@archlinux.org>
+# Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
@@ -10,9 +10,8 @@ pkgname=(
   vbam-sdl
   vbam-wx
 )
-_pkgname=visualboyadvance-m
 pkgver=2.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc='Nintendo GameBoy Advance emulator'
 arch=(x86_64)
 url='https://visualboyadvance-m.org'
@@ -29,7 +28,6 @@ depends=(
 )
 makedepends=(
   cmake
-  doctest
   ffmpeg
   git
   libglvnd
@@ -37,6 +35,7 @@ makedepends=(
   wxwidgets-gtk3
   zip
 )
+_pkgname=visualboyadvance-m
 source=("git+https://github.com/${_pkgname}/${_pkgname}.git?signed#tag=v${pkgver}")
 b2sums=('81c21a5e2ddc1a9c3ca100c95d804cad11b376ba88e0846ba2d25a9ca96c8fe0c379a332daf4f919958b8a47bbf4d7ded412ec0bf879a94203305c310d665438')
 validpgpkeys=('A0C0E526E36FD2138C149D4D08AB596679D86240' # Rafael Kitover <rkitover@gmail.com>
@@ -45,8 +44,8 @@ validpgpkeys=('A0C0E526E36FD2138C149D4D08AB596679D86240' # Rafael Kitover <rkito
 
 prepare() {
   cd ${_pkgname}
-  # Unbundle doctest (bundled one is not glibc 2.34 compatible)
-  sed -e 's|${CMAKE_SOURCE_DIR}/third_party|/usr|' -i src/wx/test/CMakeLists.txt
+  # fix conflict with gtest
+  git cherry-pick -n d619ee2bb14b3412ca7193cd4ff4a056193189de
 }
 
 build() {