diff --git a/Source/NSObject.m b/Source/NSObject.m
index b83ff7a71..12fe00921 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -464,7 +464,7 @@ static BOOL double_release_check_enabled = NO;
   return [[self class] conformsToProtocol:aProtocol];
 }
 
-- (IMP) instanceMethodForSelector: (SEL)aSelector
++ (IMP) instanceMethodForSelector: (SEL)aSelector
 {
   /*
    *	Since 'self' is an class, get_imp() will get the instance method.
@@ -829,11 +829,6 @@ static BOOL double_release_check_enabled = NO;
 
 @end
 
-
-@implementation NSObject (GNUstep)
-
-@end
-
 
 @implementation NSObject (NEXTSTEP)
 
@@ -951,7 +946,7 @@ static BOOL double_release_check_enabled = NO;
 @end
 
 
-@implementation NSObject (GNU)
+@implementation NSObject (GNUstep)
 
 /* GNU Object class compatibility */