diff --git a/CHANGES.md b/CHANGES.md
index a05a5cec4..94e7f9766 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -24,6 +24,7 @@ Bug Fixes
 * [#1636](https://github.com/java-native-access/jna/issues/1636): Drop hard dependency on java.lang.SecurityManager/java.security.AccessController - [@matthiasblaesing](https://github.com/matthiasblaesing).
 * [#1724](https://github.com/java-native-access/jna/pull/1724): Fix `host_page_size` in `c.s.j.p.mac.SystemB` and `getxattr`/`setxattr`/`listxattr` in `c.s.j.p.mac.XAttr` using `long` instead of pointer-sized types for `size_t`/`ssize_t` parameters - [@dbwiddis](https://github.com/dbwiddis).
 * [#1727](https://github.com/java-native-access/jna/pull/1727): Include DragonFlyBSD in `NativeLibrary` versioned library resolution, libc special-case loading, and 64-bit search paths - [@dbwiddis](https://github.com/dbwiddis).
+* [#1709](https://github.com/java-native-access/jna/issues/1709): Rebuild native library for OpenBSD 7.9 x86-64, drop OpenBSD x86 - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Release 5.18.1
 ==============
diff --git a/build.xml b/build.xml
index 489379c65..00bf10900 100644
--- a/build.xml
+++ b/build.xml
@@ -405,6 +405,10 @@ com/sun/jna/openbsd-x86/libjnidispatch.so;
 processor=x86;osname=openbsd,
 com/sun/jna/openbsd-x86-64/libjnidispatch.so;
 processor=x86-64;osname=openbsd,
+com/sun/jna/openbsd-x86-64/libjnidispatch.so;
+processor=sparcv9;osname=openbsd,
+com/sun/jna/openbsd-x86-64/libjnidispatch.so;
+processor=aarch64;osname=openbsd,
 
 com/sun/jna/darwin-ppc/libjnidispatch.jnilib;
 osname=macosx;processor=ppc,
@@ -551,6 +555,12 @@ osname=macosx;processor=aarch64
       <zipfileset src="${lib.native}/openbsd-x86-64.jar"
                   includes="*jnidispatch*"
                   prefix="com/sun/jna/openbsd-x86-64"/>
+      <zipfileset src="${lib.native}/openbsd-sparcv9.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/openbsd-sparcv9"/>
+      <zipfileset src="${lib.native}/openbsd-aarch64.jar"
+                  includes="*jnidispatch*"
+                  prefix="com/sun/jna/openbsd-aarch64"/>
       <zipfileset src="${lib.native}/win32-x86-64.jar"
                   includes="*jnidispatch*"
                   prefix="com/sun/jna/win32-x86-64"/>
@@ -739,6 +749,8 @@ osname=macosx;processor=aarch64
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/freebsd-ppc64.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-x86.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-x86-64.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-sparcv9.jar" overwrite="true"/>
+    <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/openbsd-aarch64.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-x86.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-x86-64.jar" overwrite="true"/>
     <copy file="${lib.native}/out-of-date.jar" tofile="${lib.native}/sunos-sparc.jar" overwrite="true"/>
diff --git a/lib/native/openbsd-aarch64.jar b/lib/native/openbsd-aarch64.jar
new file mode 100644
index 000000000..6716399ab
Binary files /dev/null and b/lib/native/openbsd-aarch64.jar differ
diff --git a/lib/native/openbsd-sparcv9.jar b/lib/native/openbsd-sparcv9.jar
new file mode 100644
index 000000000..6716399ab
Binary files /dev/null and b/lib/native/openbsd-sparcv9.jar differ
diff --git a/lib/native/openbsd-x86-64.jar b/lib/native/openbsd-x86-64.jar
index 67a905ba3..05da099ca 100644
Binary files a/lib/native/openbsd-x86-64.jar and b/lib/native/openbsd-x86-64.jar differ
diff --git a/lib/native/openbsd-x86.jar b/lib/native/openbsd-x86.jar
index 5082e73dd..6716399ab 100644
Binary files a/lib/native/openbsd-x86.jar and b/lib/native/openbsd-x86.jar differ
diff --git a/www/OpenBSD.md b/www/OpenBSD.md
new file mode 100644
index 000000000..0f6be9164
--- /dev/null
+++ b/www/OpenBSD.md
@@ -0,0 +1,30 @@
+Building JNA for OpenBSD
+========================
+
+This recipe was used to build the OpenBSD native library for OpenBSD. It uses
+the recipe for JNA.
+
+- fetch install ISO from https://www.openbsd.org/faq/faq4.html#Download
+- use a qemu setup with:
+  - a NAT network interface
+  - a Hostonly interface
+  - USB keyboard (PS2 does not work in install shell)
+  - min. 10 GB size
+  - min. 4 GB RAM
+- disable DNS for hostonly:
+  ```
+  interface em1 {
+    dns ignore;
+  }
+  ```
+- fetch ports: https://www.openbsd.org/faq/ports/ports.html
+  ```bash
+  cd /tmp
+  ftp https://cdn.openbsd.org/pub/OpenBSD/$(uname -r)/{ports.tar.gz,SHA256.sig}
+  signify -Cp /etc/signify/openbsd-$(uname -r | cut -c 1,3)-base.pub -x SHA256.sig ports.tar.gz
+  cd /usr
+  tar xzf /tmp/ports.tar.gz
+  rm /tmp/ports.tar.gz
+  ```
+- run `make` in /usr/ports/java/jna`. The resulting binary can be found in
+  usr/ports/pobj/jna-BRANCH/jna-BRANCH/build/openbsd-ARCH.jar