diff --git a/ChangeLog b/ChangeLog
index 8e7a87d67..f68181f1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-12  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/gnustep/base/NSDebug.h: Include NSDebugLog functions
+	when GSDIAGNOSE is defined.
+
 2001-12-12  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSHTTPURLHandle.m: Remove GSHTPPropertyBodyKey ... make
diff --git a/Headers/gnustep/base/NSDebug.h b/Headers/gnustep/base/NSDebug.h
index e6ac1a1f2..75aa29733 100644
--- a/Headers/gnustep/base/NSDebug.h
+++ b/Headers/gnustep/base/NSDebug.h
@@ -113,9 +113,10 @@ GS_EXPORT NSString*	GSDebugMethodMsg(id obj, SEL sel, const char *file,
 
 
 
-/* Debug logging which can be enabled/disabled by defining GSWARN (see
-   below) when compiling and also setting values in the mutable array
-   that is set up by NSProcessInfo.
+/* Debug logging which can be enabled/disabled by defining GSDIAGNOSE
+   when compiling and also setting values in the mutable array
+   that is set up by NSProcessInfo. GSDIAGNOSE is defined autmatically unless
+   diagnose=no is specified in the make arguments.
 
    NSProcess initialises a set of strings that are the names of active
    debug levels using the '--GNU-Debug=...' command line argument.
@@ -143,7 +144,7 @@ GS_EXPORT NSString*	GSDebugMethodMsg(id obj, SEL sel, const char *file,
    and either function or class/method in which the message was generated.
 
  */
-#ifdef GSWARN
+#ifdef GSDIAGNOSE
 #include	<Foundation/NSObjCRuntime.h>
 #include	<Foundation/NSProcessInfo.h>