diff --git a/ChangeLog b/ChangeLog
index e4fdf431b..a54e76d1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-18  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/AGSOutput.m: Get rid of bogus '&nbsp;'
+	* Tools/AGSHtml.m: Fix error in display of category method index.
+
 2006-03-17  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/cifframe.h: Add code to try to get ffi muld to work on
diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m
index 7f9f8b4f9..7e8455a0e 100644
--- a/Tools/AGSHtml.m
+++ b/Tools/AGSHtml.m
@@ -471,8 +471,6 @@ static NSString		*mainFont = nil;
 			      NSString	*ref = [NSString stringWithFormat:
 				@"(%@)%@", catName, mname];
 
-			      ref = [ref stringByReplacingString: @":"
-						      withString: @"$"];
 			      [m setObject: file forKey: ref];
 			    }
 			}
diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m
index 05d7c2256..832153668 100644
--- a/Tools/AGSOutput.m
+++ b/Tools/AGSOutput.m
@@ -2078,7 +2078,7 @@ static BOOL snuggleStart(NSString *t)
 		      ref = [NSString stringWithFormat:
 			@"<ref type=\"method\" id=\"%@\" class=\"%@\">",
 			mName, cName];
-		      sub = [NSString stringWithFormat: @"[%@&nbsp;%@]",
+		      sub = [NSString stringWithFormat: @"[%@ %@]",
 			cName, mName];
 		    }
 		  [a insertObject: ref atIndex: l++];