diff --git a/ChangeLog b/ChangeLog
index 146d74e56..8f835ca60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-16  Werner Lemberg  <wl@gnu.org>
+
+	Fix Savannah bug #44261.
+
+	* builds/unix/detect.mk (setup) [unix]: Set `CONFIG_SHELL' in the
+	environment also while calling the configure script.
+
 2015-02-16  Werner Lemberg  <wl@gnu.org>
 
 	* include/internal/ftmemory.h: Add some `FT_Offset' casts.
diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk
index c9986dfe1..ef007bf39 100644
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@@ -81,9 +81,12 @@ ifeq ($(PLATFORM),unix)
   ifdef must_configure
     ifneq ($(have_Makefile),)
       # we are building FT2 not in the src tree
-	      $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+	      CONFIG_SHELL="$(CONFIG_SHELL)" \
+	        $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
     else
-	      cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
+	      cd builds/unix; \
+	      CONFIG_SHELL="$(CONFIG_SHELL)" \
+	        $(CONFIG_SHELL) ./configure $(value CFG)
     endif
   endif