diff --git a/ChangeLog b/ChangeLog
index 575474041..fe802efb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-17  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSKeyValueObserving.m
+	(-setKeys:triggerChangeNotificationsForDependentKey:): Correct the
+	key strategy of the map.
+
 2007-12-17  Adam Fedor  <fedor@gnu.org>
 
 	* Source/Makefile.postamble: Use DESTDIR over obsolete INSTALL_ROOT_DIR
diff --git a/Source/NSKeyValueObserving.m b/Source/NSKeyValueObserving.m
index 3262f2162..a3d1921e3 100644
--- a/Source/NSKeyValueObserving.m
+++ b/Source/NSKeyValueObserving.m
@@ -1474,7 +1474,7 @@ triggerChangeNotificationsForDependentKey: (NSString*)dependentKey
   affectingKeys = NSMapGet(dependentKeyTable, self);
   if (!affectingKeys)
     {
-      affectingKeys = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
+      affectingKeys = NSCreateMapTable(NSObjectMapKeyCallBacks,
         NSNonOwnedPointerMapValueCallBacks, 10);
       NSMapInsert(dependentKeyTable, self, affectingKeys);
     }