diff --git a/ChangeLog b/ChangeLog
index f545492..e3af536 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-28  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	* configure.ac: Use gnustep-config to set GNUSTEP_MAKEFILES
+	if not set.
+	* GNUmakefile: Same change.
+	* configure: Regenerated.
+
 2007-02-28  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* Tools/win32pbs.m (WINVER): Define to make it compile with new
diff --git a/GNUmakefile b/GNUmakefile
index 2441c0f..4586a88 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -22,6 +22,14 @@
 #  If not, write to the Free Software Foundation,
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+ifeq ($(GNUSTEP_MAKEFILES),)
+ GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
+endif
+
+ifeq ($(GNUSTEP_MAKEFILES),)
+  $(error You need to set GNUSTEP_MAKEFILES before compiling!)
+endif
+
 # Install into the system root by default
 GNUSTEP_INSTALLATION_DOMAIN = SYSTEM
 
diff --git a/configure b/configure
index 71c9432..2407ff9 100755
--- a/configure
+++ b/configure
@@ -1315,6 +1315,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
           ac_config_headers="$ac_config_headers config.h"
 
 
+# If GNUSTEP_MAKEFILES is undefined, try to use gnustep-config to determine it.
+if test -z "$GNUSTEP_MAKEFILES"; then
+  GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5`
+fi
+
 if test -z "$GNUSTEP_MAKEFILES"; then
   { { echo "$as_me:$LINENO: error: You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!" >&5
 echo "$as_me: error: You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!" >&2;}
diff --git a/configure.ac b/configure.ac
index 6ea81f5..873f7d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,11 @@ AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([back.make.in])
 AC_CONFIG_HEADER(config.h)
 
+# If GNUSTEP_MAKEFILES is undefined, try to use gnustep-config to determine it.
+if test -z "$GNUSTEP_MAKEFILES"; then
+  GNUSTEP_MAKEFILES=`gnustep-config --variable=GNUSTEP_MAKEFILES 2>&5`
+fi
+
 if test -z "$GNUSTEP_MAKEFILES"; then
   AC_MSG_ERROR([You must have the gnustep-make package installed and set up the GNUSTEP_MAKEFILES environment variable to contain the path to the makefiles directory before configuring!])
 fi