diff --git a/ChangeLog b/ChangeLog
index a5b52c4c3..762f3a854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Source/GSString.m: Allow more length when converting unicode
 	string to integer.
+	* Source/NSObject.m: ([methodSignatureForSelector:]) return nil if
+	the receiver does not implement it.
 
 2003-06-20  Adam Fedor  <fedor@gnu.org>
 
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 89941b4ea..fe23b7c0b 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -1250,16 +1250,9 @@ static BOOL double_release_check_enabled = NO;
     : class_get_class_method(GSObjCClass(self), aSelector));
   if (mth == 0)
     {
-      types = 0;
-    }
-  else
-    {
-      types = mth->method_types;
-    }
-  if (types == 0)
-    {
-      types = sel_get_type(aSelector);
+      return nil;
     }
+  types = mth->method_types;
   if (types == 0)
     {
       return nil;