diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 79a7572..399197d 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -17,6 +17,11 @@ makedepends=(git)
 source=("git+https://github.com/riscv/riscv-isa-sim#tag=v$pkgver")
 md5sums=('SKIP')
 
+prepare() {
+  cd riscv-isa-sim
+  git cherry-pick -n b3855682c2d744c613d2ffd6b53e3f021ecea4f3
+}
+
 build() {
   cd riscv-isa-sim
   ./configure --prefix=/usr