diff --git a/ChangeLog b/ChangeLog
index 429713d85c..6b8d0b4f18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Nov 27 15:43:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: link addr2line only for ELF.
+
 Sat Nov 27 13:58:55 2010  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#candidate): : was missing.  Thanks,
diff --git a/addr2line.c b/addr2line.c
index 878ea9dd3b..443333f256 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -543,4 +543,6 @@ rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
     free(lines);
 }
 
-#endif /* defined(__ELF__) */
+#else /* defined(__ELF__) */
+#error not supported
+#endif
diff --git a/common.mk b/common.mk
index cf66e4248a..c45c3e1f71 100644
--- a/common.mk
+++ b/common.mk
@@ -91,7 +91,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		vm_dump.$(OBJEXT) \
 		thread.$(OBJEXT) \
 		cont.$(OBJEXT) \
-		addr2line.$(OBJEXT) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
diff --git a/configure.in b/configure.in
index 2168f59921..a80241b4e7 100644
--- a/configure.in
+++ b/configure.in
@@ -1844,6 +1844,7 @@ if test "$rb_cv_binary_elf" = yes; then
   if test "$with_dln_a_out" = yes; then
     AC_MSG_ERROR(dln_a_out does not work with ELF)
   fi
+  AC_LIBOBJ([addr2line])
 fi
 
 AS_CASE(["$target_os"],