diff --git a/ChangeLog b/ChangeLog
index e3d6c16fa..497fc7222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-03  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSObject.m: Fix problem with finalization of proxies and
+	remove obsolete runtime call to see if a class respons to selector.
+
 2011-03-31 Riccardo Mottola <rm@gnu.org>
 
 	* Source/ObjectiveC2/Makefile.preamble
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 293f3a818..3e28d3257 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -65,10 +65,6 @@
 #import "GSPrivate.h"
 
 
-#ifndef NeXT_RUNTIME
-extern BOOL __objc_responds_to(id, SEL);
-#endif
-
 /* When this is `YES', every call to release/autorelease, checks to
    make sure isn't being set up to release itself too many times.
    This does not need mutex protection. */
@@ -582,7 +578,8 @@ GSFinalize(void* object, void* data)
 static BOOL
 GSIsFinalizable(Class c)
 {
-  if (class_getMethodImplementation(c, finalize_sel) != finalize_imp)
+  if (class_getMethodImplementation(c, finalize_sel) != finalize_imp
+    && class_respondsToSelector(c, finalize_sel))
     return YES;
   return NO;
 }
@@ -1341,7 +1338,7 @@ objc_create_block_classes_as_subclasses_of(Class super);
 	}
       return NO;
     }
-  return __objc_responds_to((id)&self, aSelector);
+  return class_respondsToSelector(self, aSelector) ? YES : NO;
 }
 
 /**
@@ -1914,7 +1911,7 @@ objc_create_block_classes_as_subclasses_of(Class super);
       return NO;
     }
 
-  return __objc_responds_to(self, aSelector);
+  return class_respondsToSelector(object_getClass(self), aSelector) ? YES : NO;
 }
 
 /**