diff --git a/ChangeLog.GNUstep b/ChangeLog.GNUstep
index ef986bc..35b6fae 100644
--- a/ChangeLog.GNUstep
+++ b/ChangeLog.GNUstep
@@ -1,3 +1,9 @@
+2007-02-28  Nicola Pero  <nicola.pero@meta-innovation.com>	
+
+	* GNUmakefile (GNUSTEP_MAKEFILES): Use gnustep-config to
+	set this up if not already set.  Emit an error if it can't
+	be set.
+
 2007-02-13  Adam Fedor  <fedor@gnu.org>
 
 	* GNUmakefile: Set SVN module name/url.
diff --git a/GNUmakefile b/GNUmakefile
index b027cf2..53eb2aa 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -23,6 +23,14 @@
 #
 # $Id$
 
+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
+
 include $(GNUSTEP_MAKEFILES)/common.make
 
 PACKAGE_NAME = gnustep-objc