diff --git a/ChangeLog b/ChangeLog
index e5b6d3648..0d5405994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-15  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Fix off-by-one bug in CFLAGS & LDFLAGS harmonizer.
+
+	* builds/unix/configure.raw: Some important options that
+	included in CFLAGS but not in LDFLAGS are copied to
+	LDFLAGS, but the last option in CFLAGS was not checked.
+
 2011-01-13  Werner Lemberg  <wl@gnu.org>
 
 	[raster] Add undocumented drop-out rule to the other bbox side also.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index cb10ef481..a22183f37 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -250,7 +250,7 @@ fi
 save_config_args=$*
 set dummy ${CFLAGS}
 i=1
-while test $i -lt $#
+while test $i -le $#
 do
   c=$1