diff --git a/ChangeLog b/ChangeLog
index ce868d915d..933bc37d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 15 02:13:44 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
+	  Thanks Jeremy Evans! [ruby-core:32384]
+
 Tue Sep 14 20:17:48 2010  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pathname/pathname.c (path_s_getwd): Pathname.getwd and
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index a77f110514..5e9ede7b2d 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -10,7 +10,7 @@ typedef struct {
     ffi_type **argv;
 } fiddle_closure;
 
-#if defined(MACOSX) || defined(__linux)
+#if defined(MACOSX) || defined(__linux) || defined(__OpenBSD__)
 #define DONT_USE_FFI_CLOSURE_ALLOC
 #endif