diff --git a/ChangeLog b/ChangeLog
index b12dc8998..e1131c862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-15 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSConnection.m: when decoding a pointer to an object, autorelease
+	the object to avoid a leak.
+
 2010-04-14 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/ObjectiveC2/runtime.c: work around buggy objc_skip_argspec()
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 5b0e07be0..1b8c9ac68 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -2178,6 +2178,10 @@ static NSLock	*cached_proxies_gate = nil;
 		      tmptype++;
 		      [inv getArgument: &datum atIndex: argnum];
 		      [aRmc decodeValueOfObjCType: tmptype at: datum];
+		      if (*tmptype == _C_ID)
+			{
+			  [*(id*)datum autorelease];
+			}
 		    }
 		  else if (*tmptype == _C_CHARPTR
 		    && ((flags & _F_OUT) || !(flags & _F_IN)))