diff --git a/ChangeLog b/ChangeLog
index 9b8e187366..7962ff7cf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 20 14:19:12 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (AC_ARG_WITH): use withval directly.
+	  fix failure on FreeBSD.
+	  http://fb32.rubyci.org/~chkbuild/ruby-trunk/log/20131217T070301Z.diff.html.gz
+
 Fri Dec 20 14:00:01 2013  Aman Gupta <ruby@tmm1.net>
 
 	* include/ruby/ruby.h (struct RClass): add super, remove iv_index_tbl.
diff --git a/configure.in b/configure.in
index 5daeffdbc8..c2b50af49d 100644
--- a/configure.in
+++ b/configure.in
@@ -860,7 +860,6 @@ AC_ARG_WITH(opt-dir,
 	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
 		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
 	[
-		withval="$1"
 		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
 		CPPFLAGS="$CPPFLAGS $val"
 		val=`IFS="$PATH_SEPARATOR"