diff --git a/xserver/hw/xfree86/common/compiler.h b/xserver/hw/xfree86/common/compiler.h
index e9472201b..8269e3551 100644
--- a/xserver/hw/xfree86/common/compiler.h
+++ b/xserver/hw/xfree86/common/compiler.h
@@ -911,7 +911,7 @@ static __inline__ void stw_u(unsigned long val, unsigned short *p)
 #    else
 #     define PORT_SIZE short
 #    endif
-#    if defined(__arm32__) && defined(__OpenBSD__)
+#    if defined(__arm__) && defined(__OpenBSD__)
 /*
 #     include <machine/sysarch.h>
 */
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.am b/xserver/hw/xfree86/os-support/bsd/Makefile.am
index 10ff44c4e..bd9aeab9e 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.am
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.am
@@ -30,7 +30,8 @@ ARCH_SOURCES = \
 endif
 
 if ARM_VIDEO
-ARCH_SOURCES = arm_video.c
+ARCH_SOURCES = arm_video.c \
+	$(srcdir)/../shared/ioperm_noop.c
 endif
 
 if HP300_VIDEO
diff --git a/xserver/include/servermd.h b/xserver/include/servermd.h
index 8ae505c6f..7314aa0d5 100644
--- a/xserver/include/servermd.h
+++ b/xserver/include/servermd.h
@@ -130,7 +130,7 @@ SOFTWARE.
 
 #endif /* vax */
 
-#ifdef __arm32__
+#if defined(__arm32__) || defined(__arm__) && defined(__OpenBSD__)
 
 #define IMAGE_BYTE_ORDER        LSBFirst
 
diff --git a/xserver/include/xorg-config.h.in b/xserver/include/xorg-config.h.in
index e5ffb2590..c20b56e18 100644
--- a/xserver/include/xorg-config.h.in
+++ b/xserver/include/xorg-config.h.in
@@ -85,6 +85,9 @@
 /* BSD i386 iopl */
 #undef USE_I386_IOPL
 
+/* OpenBSD/arm */
+#undef USE_ARM32_MMAP
+
 /* System is BSD-like */
 #undef CSRG_BASED
 
diff --git a/xserver/os/xalloc.c b/xserver/os/xalloc.c
index 8c019f3bc..9ca87901a 100644
--- a/xserver/os/xalloc.c
+++ b/xserver/os/xalloc.c
@@ -341,6 +341,7 @@ Xalloc (unsigned long amount)
     defined(__mips__) || \
     defined(__powerpc__) || \
     defined(__arm32__) || \
+    defined(__arm__) && defined(__OpenBSD__) || \
     defined(__ia64__) || defined(ia64) || \
     defined(__s390x__) || defined(__s390__)
     amount = (amount + (sizeof(long)-1)) & ~(sizeof(long)-1);