diff --git a/ChangeLog b/ChangeLog
index 5c89e50c2..99341ce1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 2007-03-19  Nicola Pero <nicola.pero@meta-innovation.com>
 
-	* Tools/gsdoc.gsdoc: Removed reference to GNUSTEP_SYSTEM_ROOT.
-
+	* Tools/gsdoc.gsdoc: Removed reference to GNUSTEP_SYSTEM_ROOT; use
+	up-to-date variables such as GNUSTEP_SYSTEM_LIBRARY and
+	GNUSTEP_SYSTEM_DOC.
+	* Tools/gsdoc-1_0_1.rnc: Same change.
+	* Tools/gsdoc.7: Same change.
+	* Tools/gdomap.8: Same change.
+	
 2007-03-19  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSDictionary.m: Correct errors in documentation about keys
diff --git a/Tools/gdomap.8 b/Tools/gdomap.8
index f6223f00c..3975031e8 100644
--- a/Tools/gdomap.8
+++ b/Tools/gdomap.8
@@ -43,7 +43,7 @@ The gdomap daemon is used by GNUstep programs to look up distributed objects of
 processes running on the local machine as well as across the network.  This
 manual page explains the usage of gdomap.  For design and implementation
 information, please see the HTML documentation installed in
-$GNUSTEP_SYSTEM_ROOT/Library/Documentation, under Command-line Tools.
+$GNUSTEP_SYSTEM_DOC, under Command-line Tools.
 .P
 Usually the gdomap daemon is started at system boot time and binds itself to
 port 538. See the 
diff --git a/Tools/gsdoc-1_0_1.rnc b/Tools/gsdoc-1_0_1.rnc
index 8e6cd9529..ef21ff626 100644
--- a/Tools/gsdoc-1_0_1.rnc
+++ b/Tools/gsdoc-1_0_1.rnc
@@ -40,10 +40,10 @@
 #  <?xml version="1.0" encoding="utf-8"?>
 #  <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
 #     <uri pathSuffix=".gsdoc"
-#          uri="$GNUSTEP_SYSTEM_ROOT/Library/DTDs/gsdoc-1_0_1.rnc"/>
+#          uri="$GNUSTEP_SYSTEM_LIBRARY/DTDs/gsdoc-1_0_1.rnc"/>
 #  </locatingRules>
 #
-# (Replace GNUSTEP_SYSTEM_ROOT by the correct real path on your system.)
+# (Replace GNUSTEP_SYSTEM_LIBRARY by the correct real path on your system.)
 #
 # Voila, whenever you edit a .gsdoc file its validity will be continuously
 # checked, errors will be highlighted, and you can complete tags and
diff --git a/Tools/gsdoc.7 b/Tools/gsdoc.7
index 249452f5e..a0aa87d7d 100644
--- a/Tools/gsdoc.7
+++ b/Tools/gsdoc.7
@@ -19,8 +19,8 @@ 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
-\fIGNUSTEP_SYSTEM_ROOT/Library/DTDs\fR in a standard GNUstep installation...
-where GNUSTEP_SYSTEM_ROOT is defined in the GNUstep configuration
+\fIGNUSTEP_SYSTEM_LIBRARY/DTDs\fR in a standard GNUstep installation...
+where GNUSTEP_SYSTEM_LIBRARY is defined in the GNUstep configuration
 file (GNUstep.conf).
 
 .SH USAGE
@@ -34,8 +34,8 @@ 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
-\fIGNUSTEP_SYSTEM_ROOT/Library/Documentation/Developer/Tools\fR...
-where GNUSTEP_SYSTEM_ROOT is defined in the GNUstep configuration
+\fIGNUSTEP_SYSTEM_DOC/Developer/Tools\fR...
+where GNUSTEP_SYSTEM_DOC is defined in the GNUstep configuration
 file (GNUstep.conf).
 
 .SH SEE ALSO