diff --git a/ChangeLog b/ChangeLog
index 07cefbec3..ea5310f5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-28  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSObject.m: Change order of zombie initialisation for
+	darwin port.
+
 2002-05-28  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/gnustep/base/GSMime.h: Make set... methods return void.
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 9c512f78a..924996784 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -719,9 +719,9 @@ static BOOL double_release_check_enabled = NO;
       gnustep_global_lock = [[NSRecursiveLock alloc] init];
 
       // Zombie management stuff.
-      zombieClass = [NSZombie class];
       zombieMap = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
 	NSNonOwnedPointerMapValueCallBacks, 0);
+      zombieClass = [NSZombie class];
       NSZombieEnabled = GSEnvironmentFlag("NSZombieEnabled", NO);
       NSDeallocateZombies = GSEnvironmentFlag("NSDeallocateZombies", NO);