diff --git a/ChangeLog b/ChangeLog
index 0e0d925874..e1a3be5a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  5 01:22:46 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* addr2line.c: include <alloca.h> to fix a build issue on Solaris.
+
 Tue Jul  5 00:49:05 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* ext/coverage/coverage.c: resurrect r32071 + add GC guard for
diff --git a/addr2line.c b/addr2line.c
index 68e38cdb7b..ea61c15054 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -24,6 +24,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <alloca.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/types.h>