diff --git a/net-dns/bind_utils/bind_utils-9.16.19.recipe b/net-dns/bind_utils/bind_utils-9.16.36.recipe
similarity index 78%
rename from net-dns/bind_utils/bind_utils-9.16.19.recipe
rename to net-dns/bind_utils/bind_utils-9.16.36.recipe
index 878a5bac4..6cccd9912 100644
--- a/net-dns/bind_utils/bind_utils-9.16.19.recipe
+++ b/net-dns/bind_utils/bind_utils-9.16.36.recipe
@@ -5,17 +5,25 @@ COPYRIGHT="Internet Systems Consortium, Inc. ('ISC')"
 LICENSE="MPL v2.0"
 REVISION="1"
 SOURCE_URI="ftp://ftp.isc.org/isc/bind9/$portVersion/bind-$portVersion.tar.xz"
-CHECKSUM_SHA256="20bf727559302c933475904847041916bb6c279680c170babc01a76998e80ad3"
+CHECKSUM_SHA256="508c94e8c9884f6075fa820a51efae04a1758dbdd157b01695ea6cd07049c221"
 SOURCE_DIR="bind-$portVersion"
 PATCHES="bind_utils-$portVersion.patchset"
 
-ARCHITECTURES="?all !x86_gcc2"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
 	bind_utils$secondaryArchSuffix = $portVersion
-	cmd:dig
-	cmd:host
-	cmd:nslookup
+	cmd:dig$commandSuffix
+	cmd:host$commandSuffix
+	cmd:nslookup$commandSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
diff --git a/net-dns/bind_utils/patches/bind_utils-9.16.19.patchset b/net-dns/bind_utils/patches/bind_utils-9.16.36.patchset
similarity index 87%
rename from net-dns/bind_utils/patches/bind_utils-9.16.19.patchset
rename to net-dns/bind_utils/patches/bind_utils-9.16.36.patchset
index bbbe08a4d..47a19e6fb 100644
--- a/net-dns/bind_utils/patches/bind_utils-9.16.19.patchset
+++ b/net-dns/bind_utils/patches/bind_utils-9.16.36.patchset
@@ -1,20 +1,17 @@
-From 63a8d2da718c751d8d4134b8cb9a66c80216fbfe Mon Sep 17 00:00:00 2001
+From 49eaab4894283909a9e229fe3f5cecb9bb7fba32 Mon Sep 17 00:00:00 2001
 From: Alexander von Gluck IV <kallisti5@unixzen.com>
 Date: Tue, 3 Aug 2021 13:10:12 -0500
-Subject: [PATCH] haiku: patch in our endian code
+Subject: haiku: patch in our endian code
 
 * There's likely better ways to do this with
   _BSD_SOURCE, but I wasn't able to get the standard
   methods working
----
- lib/isc/include/isc/endian.h | 49 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 48 insertions(+), 1 deletion(-)
 
 diff --git a/lib/isc/include/isc/endian.h b/lib/isc/include/isc/endian.h
-index dc770f6..e1a3c50 100644
+index e598a7b..da52c32 100644
 --- a/lib/isc/include/isc/endian.h
 +++ b/lib/isc/include/isc/endian.h
-@@ -11,7 +11,54 @@
+@@ -13,7 +13,54 @@
  
  #pragma once
  
@@ -71,5 +68,5 @@ index dc770f6..e1a3c50 100644
  
  #include <sys/endian.h>
 -- 
-2.30.2
+2.37.3