--- include/pub_tool_libcsetjmp.h.orig
+++ include/pub_tool_libcsetjmp.h
@@ -90,7 +90,8 @@
 
 
 #elif defined(VGP_amd64_linux) || defined(VGP_amd64_darwin) || \
-      defined(VGP_amd64_solaris) || defined(VGP_amd64_freebsd)
+      defined(VGP_amd64_solaris) || defined(VGP_amd64_freebsd) || \
+      defined(VGP_amd64_openbsd)
 
 #define VG_MINIMAL_JMP_BUF(_name)        ULong _name [16+1]
 __attribute__((returns_twice))
@@ -100,7 +101,8 @@
 
 
 #elif defined(VGP_x86_linux) || defined(VGP_x86_darwin) || \
-      defined(VGP_x86_solaris) || defined(VGP_x86_freebsd)
+      defined(VGP_x86_solaris) || defined(VGP_x86_freebsd) || \
+      defined(VGP_x86_openbsd)
 
 #define VG_MINIMAL_JMP_BUF(_name)        UInt _name [8+1]
 __attribute__((returns_twice))