diff --git a/ChangeLog b/ChangeLog
index 6b79aa6db8..8b954871bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 12 11:33:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c: OpenBSD uses the elf_abi.h header file instead of the
+	  elf.h header file. patched by Jeremy Evans [ruby-core:34384]
+
 Wed Jan 12 03:59:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* test/webrick/test_cgi.rb: Removes usage of deprecated
diff --git a/addr2line.c b/addr2line.c
index f1f8b4d8ba..605c6f60d3 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -15,7 +15,11 @@
 
 #ifdef __ELF__
 
+#ifdef __OpenBSD__
+#include <elf_abi.h>
+#else
 #include <elf.h>
+#endif
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>