diff --git a/ChangeLog b/ChangeLog
index 5037ec3bd..bef79d676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	Ignore the environmental setting of LIBTOOL.
+	Patch is suggested by Adrian Bunk, to prevent unexpected
+	reflection of environmental LIBTOOL.  See:
+	http://savannah.nongnu.org/patch/?7290
+
+	* builds/unix/unix-cc.in: LIBTOOL is unconditionally set to
+	$(FT_LIBTOOL_DIR)/libtool.  FT_LIBTOOL_DIR is set to $(BUILD_DIR)
+	by default.
+	* configure: When configured for the building out of source tee,
+	FT_LIBTOOL_DIR is set to $(OBJ_DIR).
+
 2010-08-31  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	[truetype] Decrease the trace level catching the interpreter error.
diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in
index 9c6d5de6e..b84bc5d27 100644
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -14,8 +14,9 @@
 
 CC           := @CC@
 COMPILER_SEP := $(SEP)
+FT_LIBTOOL_DIR ?= $(BUILD_DIR)
 
-LIBTOOL ?= $(BUILD_DIR)/libtool
+LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
 
 
 # The object file extension (for standard and static libraries).  This can be
diff --git a/configure b/configure
index 2efa26967..d05fd2997 100755
--- a/configure
+++ b/configure
@@ -91,7 +91,7 @@ if test "$abs_curr_dir" != "$abs_ft2_dir"; then
   echo "OBJ_DIR   := $abs_curr_dir"             >> Makefile
   echo "OBJ_BUILD := \$(OBJ_DIR)"               >> Makefile
   echo "DOC_DIR   := \$(OBJ_DIR)/reference"     >> Makefile
-  echo "LIBTOOL   := \$(OBJ_DIR)/libtool"       >> Makefile
+  echo "FT_LIBTOOL_DIR   := \$(OBJ_DIR)"        >> Makefile
   echo "ifndef FT2DEMOS"                        >> Makefile
   echo "  include \$(TOP_DIR)/Makefile"         >> Makefile
   echo "else"                                   >> Makefile