diff --git a/ChangeLog b/ChangeLog
index 129163388c..91a3e584c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  5 13:49:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* addr2line.c: fix r32407 to check HAVE_ALLOCA_H.
+
 Tue Jul  5 14:05:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/webrick/httpauth/digestauth.rb (_authenticate):
diff --git a/addr2line.c b/addr2line.c
index ea61c15054..71ebf0365f 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -8,6 +8,7 @@
 
 **********************************************************************/
 
+#include "ruby/config.h"
 #include "addr2line.h"
 
 #include <stdio.h>
@@ -24,13 +25,16 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <alloca.h>
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#endif
+
 #ifdef HAVE_DL_ITERATE_PHDR
 # ifndef _GNU_SOURCE
 #  define _GNU_SOURCE