diff --git a/ChangeLog b/ChangeLog
index 0e8d2a74e..f5ff5c279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-09  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSDistantObject.m: ([-methodSignatureForSelector:])
+	Fix attempting to handle creation of local method signature rather than
+	returning a proxy to a remote one.
+
 2000-05-07  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSCalendarDate.m: ([-descriptionWithCalendarFormat:locale:])
diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m
index 7ae1b013b..f7646bb55 100644
--- a/Source/NSDistantObject.m
+++ b/Source/NSDistantObject.m
@@ -573,13 +573,16 @@ enum
 
 - (NSMethodSignature*) methodSignatureForSelector: (SEL)aSelector
 {
-  if (_object)
+  if (_object != nil)
     {
-      return [_object methodSignatureForSelector: aSelector];
+      NSMethodSignature	*m = [_object methodSignatureForSelector: aSelector];
+      const char	*types = [m methodType];
+
+      return [NSMethodSignature signatureWithObjCTypes: types];
     }
   else
     {
-      if (_protocol)
+      if (_protocol != nil)
 	{
 	  const char	*types = 0;