diff --git a/ChangeLog.GNUstep b/ChangeLog.GNUstep
index 35b6fae..1e4f1e2 100644
--- a/ChangeLog.GNUstep
+++ b/ChangeLog.GNUstep
@@ -1,3 +1,9 @@
+2007-05-06  Nicola Pero  <nicola.pero@meta-innovation.com>	
+
+	* configure: Added code at the very beginning to print an help
+	message and abort.  Users who don't read the README.GNUstep
+	might otherwise try to run configure, messing everything up.
+
 2007-02-28  Nicola Pero  <nicola.pero@meta-innovation.com>	
 
 	* GNUmakefile (GNUSTEP_MAKEFILES): Use gnustep-config to
diff --git a/configure b/configure
index 1c04b71..7e373e9 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,15 @@
 #! /bin/sh
+
+echo "To compile this library, don't run the configure script. First edit the"
+echo "GNUmakefile to set the type of threading you want, then type"
+echo ""
+echo "make"
+echo "make install"
+echo ""
+echo "Please note that you need gnustep-make >= 2.0.0 to compile this library."
+
+exit 1
+
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for package-unused version-unused.
 #