diff --git a/ChangeLog b/ChangeLog
index 0cb50b4d9..c2be3231f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-22  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Tools/AGSOutput.m: escape angle brackets in types of function
+	arguments.
+
 2007-07-19 Riccardo Mottola <riccardo@kaffe.org> 
 
 	* Source/NSKeyValueCoding.m:
diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m
index eb04b9ee7..3054ab4e8 100644
--- a/Tools/AGSOutput.m
+++ b/Tools/AGSOutput.m
@@ -825,16 +825,16 @@ static BOOL snuggleStart(NSString *t)
       NSString		*s = [a objectForKey: @"BaseType"];
 
       [str appendString: @"        <arg type=\""];
-      [str appendString: s];
+      [str appendString: escapeType(s)];
       s = [a objectForKey: @"Prefix"];
       if (s != nil)
 	{
-	  [str appendString: s];
+	  [str appendString: escapeType(s)];
 	}
       s = [a objectForKey: @"Suffix"];
       if (s != nil)
 	{
-	  [str appendString: s];
+	  [str appendString: escapeType(s)];
 	}
       [str appendString: @"\">"];
       [str appendString: [a objectForKey: @"Name"]];