diff --git a/ChangeLog b/ChangeLog
index e7d0b24fd..c7331f6c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-06  David Ayers  <d.ayers@inode.at>
+
+	* Source/Additions/GSObjCRuntime.m
+	(GSObjCMethodNames): Unify implementation for both runtimes.
+
 2004-06-05  David Ayers  <d.ayers@inode.at>
 
 	* Headers/Additions/GNUstepBase/GSObjCRuntime.h
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index eb549a722..8d8d895cd 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -204,7 +204,6 @@ GSObjCMethodNames(id obj)
 
   while (class != nil)
     {
-#ifdef NeXT_RUNTIME
       void *iterator = 0;
 
       while ((methods = class_nextMethodList(class, &iterator)) )
@@ -218,32 +217,15 @@ GSObjCMethodNames(id obj)
 	      if (method->method_name != 0)
 		{
 		  NSString	*name;
+                  const char *cName;
 
-		  name = [[NSString alloc] initWithUTF8String:
-		    (const char *)method->method_name];
+                  cName = GSNameFromSelector(method->method_name);
+                  name = [[NSString alloc] initWithUTF8String: cName];
 		  [set addObject: name];
 		  RELEASE(name);
 		}
 	    }
 	}
-#else
-      methods = class->methods;
-      while (methods != 0)
-	{
-	  int	i;
-
-	  for (i = 0; i < methods->method_count; i++)
-	    {
-	      NSString	*name;
-
-	      name = [[NSString alloc] initWithUTF8String:
-		GSNameFromSelector(methods->method_list[i].method_name)];
-	      [set addObject: name];
-	      RELEASE(name);
-	    }
-	  methods = methods->method_next;
-	}
-#endif
       class = class->super_class;
     }