diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bd3194118bd51..7502b1a967bac 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,6 +59,24 @@ jobs:
           # reduce time required to install packages by disabling pacman's disk space checking
           sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf &&
 
+          # help git-sdk-arm64 switch from `asciidoc` to `asciidoctor`
+          if test mingw-w64-git = '${{ matrix.directory }}'
+          then
+            packages=$(ls -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* 2>/dev/null |
+              sed -e 's|-[0-9].*||' -e 's|.*/||')
+            if test -n "$packages"
+            then
+              pacman -R --noconfirm $packages
+            fi &&
+            for prefix in /mingw32 /mingw64 /clangarm64
+            do
+              if test -x $prefix/bin/gem
+              then
+                PATH=$prefix/bin:$PATH gem uninstall asciidoctor
+              fi
+            done
+          fi &&
+
           top_dir=$PWD &&
           cd "${{ matrix.directory }}" &&
           MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&
diff --git a/mingw-w64-git/PKGBUILD b/mingw-w64-git/PKGBUILD
index 26ba88fd2bd21..9a3ea670d53da 100644
--- a/mingw-w64-git/PKGBUILD
+++ b/mingw-w64-git/PKGBUILD
@@ -17,7 +17,7 @@ license=('GPL2')
 
 options=()
 makedepends=('python' 'less' 'openssh' 'patch' 'make' 'tar' 'diffutils'
-	'ca-certificates' 'xmlto' "${MINGW_PACKAGE_PREFIX}-asciidoctor-extensions")
+	'ca-certificates' 'xmlto' "${MINGW_PACKAGE_PREFIX}-asciidoctor")
 install=git.install
 
 case "$(printf "%s\n%s\n" "$pkgver" "2.18.0" | sort -V)" in
@@ -74,7 +74,6 @@ sha256sums=('SKIP'
             '7413506c59d25621e475aa45447993748332c72cfbb4cf94cce6bee6f1218a09'
             '6d83e1cb1acdb6eb1f2d5cb9299298e57680f5ca43d43c3e67c9da17f21b9b01')
 
-USE_ASCIIDOCTOR="YesPlease"
 COMPAT_CFLAGS=
 STRIP=
 STRIP_OPTS=
@@ -98,13 +97,6 @@ else
   options+=('strip')
 fi
 
-if test CLANGARM64 = "$MSYSTEM"
-then
-  # Asciidoctor depends on Ruby which is not available for CLANGARM64 yet
-  makedepends=("${makedepends[@]/${MINGW_PACKAGE_PREFIX}-asciidoctor-extensions}")
-  USE_ASCIIDOCTOR=
-fi
-
 pkgver() {
   cd "$srcdir/git"
   basever=${tag%.windows.*}
@@ -130,7 +122,7 @@ prepare () {
   cd "$srcdir/git" &&
 
   cat >config.mak <<-EOF
-USE_ASCIIDOCTOR = $USE_ASCIIDOCTOR
+USE_ASCIIDOCTOR = YesPlease
 COMPAT_CFLAGS += $COMPAT_CFLAGS
 LDFLAGS = $LDFLAGS
 EOF