diff --git a/java/tanukiwrapper/Makefile b/java/tanukiwrapper/Makefile
index db2a21401b6..487b51ed9f5 100644
--- a/java/tanukiwrapper/Makefile
+++ b/java/tanukiwrapper/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2021/10/16 08:07:39 rsadowski Exp $
+# $OpenBSD: Makefile,v 1.24 2021/10/31 13:00:03 phessler Exp $
 
 COMMENT=	Tanuki Java Service Wrapper
 
@@ -31,7 +31,7 @@ MAKE_ARCH=x86-32
 .elif ${MACHINE_ARCH} == "amd64"
 MAKE_ARCH=x86-64
 .elif ${MACHINE_ARCH} == "aarch64"
-MAKE_ARCH=armhf-64
+MAKE_ARCH=arm-64
 .elif ${MACHINE_ARCH} == "sparc64"
 MAKE_ARCH=sparc-64
 .endif
diff --git a/java/tanukiwrapper/files/Makefile-openbsd-armhf-64.gmake b/java/tanukiwrapper/files/Makefile-openbsd-arm-64.gmake
similarity index 100%
rename from java/tanukiwrapper/files/Makefile-openbsd-armhf-64.gmake
rename to java/tanukiwrapper/files/Makefile-openbsd-arm-64.gmake
diff --git a/java/tanukiwrapper/patches/patch-build_xml b/java/tanukiwrapper/patches/patch-build_xml
index 498fc808e08..73321994562 100644
--- a/java/tanukiwrapper/patches/patch-build_xml
+++ b/java/tanukiwrapper/patches/patch-build_xml
@@ -1,4 +1,4 @@
-$OpenBSD: patch-build_xml,v 1.5 2021/10/16 08:07:39 rsadowski Exp $
+$OpenBSD: patch-build_xml,v 1.6 2021/10/31 13:00:04 phessler Exp $
 
 define OpenBSD property
 
@@ -37,7 +37,7 @@ Index: build.xml
          <release-delta-extract-platform osname="linux"   osarch="arm"       bits="64" wrapperbinhead="wrapper" wrapperbintail=""     wrapperlibhead="libwrapper" wrapperlibtail=".so"     archivetype="tar.gz"/>
 +        <release-delta-extract-platform osname="openbsd"   osarch="x86"     bits="32" wrapperbinhead="wrapper" wrapperbintail=""     wrapperlibhead="libwrapper" wrapperlibtail=".so"     archivetype="tar.gz"/>
 +        <release-delta-extract-platform osname="openbsd"   osarch="x86"     bits="64" wrapperbinhead="wrapper" wrapperbintail=""     wrapperlibhead="libwrapper" wrapperlibtail=".so"     archivetype="tar.gz"/>
-+        <release-delta-extract-platform osname="openbsd"   osarch="armhf"   bits="64" wrapperbinhead="wrapper" wrapperbintail=""     wrapperlibhead="libwrapper" wrapperlibtail=".so"     archivetype="tar.gz"/>
++        <release-delta-extract-platform osname="openbsd"   osarch="arm"     bits="64" wrapperbinhead="wrapper" wrapperbintail=""     wrapperlibhead="libwrapper" wrapperlibtail=".so"     archivetype="tar.gz"/>
 +        <release-delta-extract-platform osname="openbsd"   osarch="sparc"   bits="64" wrapperbinhead="wrapper" wrapperbintail=""     wrapperlibhead="libwrapper" wrapperlibtail=".so"     archivetype="tar.gz"/>
      </target>
      <target name="release-delta" depends="pre-release:check, release-delta:init, release-delta:extract-platforms">