diff --git a/ChangeLog b/ChangeLog
index 2963c7b38..3b9a59a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* Source/NSPathUtilities.m: NSOpenStepRootDirectory() remove
 	deprecated status in documentation. Try to clarify doc.
 	Get rid of environment variable.  Use native path for mingw32
+	* Tools/gsdoc.7: Fix obsolete reference to environment variable.
+	* Tools.gsdoc.gsdoc: ditto
 
 2005-11-11  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Tools/gsdoc.7 b/Tools/gsdoc.7
index 7505d93fe..249452f5e 100644
--- a/Tools/gsdoc.7
+++ b/Tools/gsdoc.7
@@ -19,7 +19,9 @@ The GSDoc markup language is defined by an SGML DTD, that specifies the tags
 that may be used in marking up a GSDoc document, and how and where those tags
 may be placed. The reader is encouraged to consult the DTD directly on any
 points that the other documentation leaves unclear. The DTD is stored under
-\fI$GNUSTEP_ROOT/System/Library/DTDs\fR in a standard GNUstep installation.
+\fIGNUSTEP_SYSTEM_ROOT/Library/DTDs\fR in a standard GNUstep installation...
+where GNUSTEP_SYSTEM_ROOT is defined in the GNUstep configuration
+file (GNUstep.conf).
 
 .SH USAGE
 GSDoc may be written by hand, but it is primarily autogenerated from
@@ -32,7 +34,9 @@ into HTML, texinfo, man page, and other formats using XSLT.
 The primary documentation source for GSDoc is the GNUstep system HTML
 documentation, under the Tools section.  In a standard GNUstep installation
 this should be found under
-\fI$GNUSTEP_ROOT/System/Library/Documentation/Developer/Tools\fR.
+\fIGNUSTEP_SYSTEM_ROOT/Library/Documentation/Developer/Tools\fR...
+where GNUSTEP_SYSTEM_ROOT is defined in the GNUstep configuration
+file (GNUstep.conf).
 
 .SH SEE ALSO
 .P
diff --git a/Tools/gsdoc.gsdoc b/Tools/gsdoc.gsdoc
index 21aa0af6e..8666d499b 100644
--- a/Tools/gsdoc.gsdoc
+++ b/Tools/gsdoc.gsdoc
@@ -102,8 +102,9 @@ notice and this notice are preserved.
         and where those tags may be placed.  The reader is encouraged to
         consult the DTD directly on any points that the present document leaves
         unclear.  The DTD is stored under
-        <code>$GNUSTEP_ROOT/System/Library/DTDs</code> in a standard GNUstep
-        installation.
+        <code>GNUSTEP_SYSTEM_ROOT/System/Library/DTDs</code> in a standard
+	GNUstep installation. .. where GNUSTEP_SYSTEM_ROOT is defined in
+	the GNUstep configuration file (GNUstep.conf).
       </p>
       <p>
         The gsdoc DTD defines an XML language - that is, a markup language