diff --git a/ChangeLog b/ChangeLog
index adebe4d12..e32feaaee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-26  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSObject.m: Implement methods from the Object(NSObjectCompat)
+	category for NSZombie.  This is a workaround for what seems to be an
+	objc runtime bug (that category is being added to NSZombie even though
+	NSZombie is not a subclass of Object).
+
 2010-06-25  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSURL.m: Implement keyed coding
diff --git a/Headers/Foundation/Foundation.h b/Headers/Foundation/Foundation.h
index d2486cfb0..baefe0be5 100644
--- a/Headers/Foundation/Foundation.h
+++ b/Headers/Foundation/Foundation.h
@@ -78,7 +78,6 @@
 #import	<Foundation/NSKeyedArchiver.h>
 #import	<Foundation/NSKeyValueCoding.h>
 #import	<Foundation/NSKeyValueObserving.h>
-#import	<Foundation/NSLocale.h>
 #import	<Foundation/NSLock.h>
 #import	<Foundation/NSMapTable.h>
 #import	<Foundation/NSMethodSignature.h>
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 1f06de859..d31059b95 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -2423,6 +2423,14 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
 {
   return (Class)isa;
 }
+- (void) dealloc
+{
+  GSLogZombie(self, _cmd);
+}
+- (void) description
+{
+  GSLogZombie(self, _cmd);
+}
 - (Class) originalClass
 {
   return NSMapGet(zombieMap, (void*)self);
@@ -2455,6 +2463,20 @@ objc_create_block_classes_as_subclasses_of(Class super) __attribute__((weak));
   [allocationLock unlock];
   return [c instanceMethodSignatureForSelector: aSelector];
 }
+- (void) release
+{
+  GSLogZombie(self, _cmd);
+}
+- (BOOL) respondsToSelector: (SEL)aSel
+{
+  GSLogZombie(self, _cmd);
+  return NO;
+}
+- (id) retain
+{
+  GSLogZombie(self, _cmd);
+  return self;
+}
 @end
 
 @implementation GSContentAccessingProxy