diff --git a/ChangeLog b/ChangeLog
index eafdf5275..8e49d1f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* Source/Unicode.m: GSFromUnicode(), GSToUnicode(), bugfix - ensure
 	that returned memory is allocated from specified zone, rather than
 	returning internal buffer.
+	* Tools/AGSIndex.m: When a string missmatch is found when merging,
+	update the output to the new string as well as warning.
+	* Tools/autogsdoc.m: Don't automatically include refs to installed
+	copies of the project being documented.
 
 2002-05-13  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Tools/AGSIndex.m b/Tools/AGSIndex.m
index d66d30ef8..5ffd6f238 100644
--- a/Tools/AGSIndex.m
+++ b/Tools/AGSIndex.m
@@ -89,6 +89,7 @@ mergeDictionaries(NSMutableDictionary *dst, NSDictionary *src, BOOL override)
 		    {
 		      NSLog(@"String missmatch in merge for %@. S:%@, D:%@",
 			stack, s, d);
+		      [dst setObject: s forKey: k];
 		    }
 		}
 	    }
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index b65d7fad6..be8fb2f57 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -237,7 +237,11 @@
       the cross reference ... if it is an empty string, the path to use
       is assumed to be a file in the same directory where the igsdoc
       file was found, otherwise it is used as a prefix to the name in
-      the index.
+      the index.<br />
+      NB. Local projects with the same name as the project currently
+      being documented will <em>not</em> be included by this mechanism.
+      If you wish to include such projects, you must do so explicitly
+      using <em>-Projects</em>
     </item>
     <item><strong>Project</strong>
       May be used to specify the name of this project ... determines the
@@ -280,7 +284,11 @@
       the cross reference ... if it is an empty string, the path to use
       is assumed to be a file in the same directory where the igsdoc
       file was found, otherwise it is used as a prefix to the name in
-      the index.
+      the index.<br />
+      NB. System projects with the same name as the project currently
+      being documented will <em>not</em> be included by this mechanism.
+      If you wish to include such projects, you must do so explicitly
+      using <em>-Projects</em>
     </item>
     <item><strong>Up</strong>
       A string used to supply the name to be used in the 'up' link from
@@ -357,6 +365,7 @@ main(int argc, char **argv, char **env)
   NSString		*declared;
   NSString		*headerDirectory;
   NSString		*project;
+  NSString		*refsName;
   NSDictionary		*originalIndex;
   AGSIndex		*projectRefs;
   AGSIndex		*globalRefs;
@@ -417,6 +426,7 @@ main(int argc, char **argv, char **env)
 
   declared = [defs stringForKey: @"Declared"];
   project = [defs stringForKey: @"Project"];
+  refsName = [[project stringByAppendingPathExtension: @"igsdoc"] copy];
 
   headerDirectory = [defs stringForKey: @"HeaderDirectory"];
   if (headerDirectory == nil)
@@ -924,7 +934,8 @@ main(int argc, char **argv, char **env)
 		{
 		  NSString	*ext = [file pathExtension];
 
-		  if ([ext isEqualToString: @"igsdoc"] == YES)
+		  if ([ext isEqualToString: @"igsdoc"] == YES
+		    && [[file lastPathComponent] isEqual: refsName] == NO)
 		    {
 		      NSString	*key;
 		      NSString	*val;
@@ -962,8 +973,10 @@ main(int argc, char **argv, char **env)
 	      while ((file = [enumerator nextObject]) != nil)
 		{
 		  NSString	*ext = [file pathExtension];
+		  
 
-		  if ([ext isEqualToString: @"igsdoc"] == YES)
+		  if ([ext isEqualToString: @"igsdoc"] == YES
+		    && [[file lastPathComponent] isEqual: refsName] == NO)
 		    {
 		      NSString	*key;
 		      NSString	*val;