diff --git a/ChangeLog b/ChangeLog
index aca73de7f..ebc3d8cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-29  Matt Rice  <ratmice@yahoo.com>
+
+	* Source/Additions/GSObjCRuntime.m (GSObjCAllSubclassesOfClass,
+	GSObjCDirectSubclassesOfClass): skip meta classes.
+
 2004-10-28  Adam Fedor  <fedor@gnu.org>
 
 	* Version 1.10.1
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index cef1eb0f0..cb83ffe78 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -2140,6 +2140,8 @@ NSArray *GSObjCAllSubclassesOfClass(Class cls)
 #ifdef GNU_RUNTIME
       for (aClass = cls->subclass_list; aClass; aClass=aClass->sibling_class)
 	{
+	  if (CLS_ISMETA(aClass))
+	    continue;
 	  [result addObject:aClass];
 	  [result addObjectsFromArray: GSObjCAllSubclassesOfClass(aClass)];
 	}
@@ -2166,6 +2168,8 @@ NSArray *GSObjCDirectSubclassesOfClass(Class cls)
 #ifdef GNU_RUNTIME
       for (aClass = cls->subclass_list;aClass;aClass=aClass->sibling_class)
 	{
+	  if (CLS_ISMETA(aClass))
+	    continue;
 	  [result addObject:aClass];
 	}
 #else