diff --git a/ChangeLog b/ChangeLog
index 9b12de4b7..c532724f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20  Adam Fedor  <fedor@gnu.org>
+
+	* SSL/configure.ac: Check for GNUSTEP_MAKEFILES not
+	GNUSTEP_SYSTEM_ROOT.
+
 2005-12-15  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSMessagePort.m:
diff --git a/SSL/configure b/SSL/configure
index 2d12769ac..b67b2efb5 100755
--- a/SSL/configure
+++ b/SSL/configure
@@ -1304,9 +1304,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-if test -z "$GNUSTEP_SYSTEM_ROOT"; then
-  { { echo "$as_me:$LINENO: error: You must run the GNUstep initialization script first!" >&5
-echo "$as_me: error: You must run the GNUstep initialization script first!" >&2;}
+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;}
    { (exit 1); exit 1; }; }
 fi
 
diff --git a/SSL/configure.ac b/SSL/configure.ac
index f293c42a9..acada4258 100644
--- a/SSL/configure.ac
+++ b/SSL/configure.ac
@@ -23,8 +23,8 @@
 AC_INIT
 AC_CONFIG_SRCDIR([GSSSLHandle.m])
 
-if test -z "$GNUSTEP_SYSTEM_ROOT"; then
-  AC_MSG_ERROR([You must run the GNUstep initialization script first!])
+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
 
 #--------------------------------------------------------------------