diff --git a/ChangeLog b/ChangeLog
index a685ce97d8..abdc97f6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct  1 02:34:53 2012  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in (--with-opt-dir): Make this also work on DLDFLAGS
+	  so LIBRUBY_SO links fine with libexecinfo installed in a
+	  non-system directory.
+
 Sun Sep 30 23:32:00 2012  Kenta Murata  <mrkn@mrkn.jp>
 
 	* vm_dump.c (rb_vm_bugreport): add /Library/Logs/DiagnosticReports
diff --git a/configure.in b/configure.in
index 8869b01961..c8fadab9e4 100644
--- a/configure.in
+++ b/configure.in
@@ -2353,7 +2353,9 @@ AC_ARG_WITH(opt-dir,
 	[
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		val=`echo $withval|sed 's/\\//\\\\\\//g'`
-		LDFLAGS="$LDFLAGS "`echo ${LIBPATHFLAG} ${RPATHFLAG}|sed -E 's/%1\\$-s|%s/'${val}'\/lib/g'`
+		val=`echo ${LIBPATHFLAG} ${RPATHFLAG}|sed -E 's/%1\\$-s|%s/'${val}'\/lib/g'`
+		LDFLAGS="$LDFLAGS $val"
+		DLDFLAGS="$DLDFLAGS $val"
 	])
 
 AS_CASE(["$target_cpu-$target_os"],