diff --git a/Foundation/CPDictionary.j b/Foundation/CPDictionary.j
index f805282f2..0b742c98c 100755
--- a/Foundation/CPDictionary.j
+++ b/Foundation/CPDictionary.j
@@ -316,7 +316,7 @@
 */
 - (CPArray)allKeys
 {
-    return _keys;
+    return [_keys copy];
 }
 
 /*!
@@ -475,7 +475,7 @@
     var index = keysForRemoval.length;
 
     while (index--)
-        self.removeValueForKey(keysForRemoval[index]);
+        [self removeObjectForKey:keysForRemoval[index]];
 }
 
 /*
diff --git a/Foundation/CPKeyValueObserving.j b/Foundation/CPKeyValueObserving.j
index 9662d5064..5612adaf2 100644
--- a/Foundation/CPKeyValueObserving.j
+++ b/Foundation/CPKeyValueObserving.j
@@ -226,7 +226,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
     var currentClass = _nativeClass,
         kvoClassName = "$KVO_"+class_getName(_nativeClass),
         existingKVOClass = objj_lookUpClass(kvoClassName);
-    
+
     if (existingKVOClass)
     {
         _targetObject.isa = existingKVOClass;
@@ -247,6 +247,18 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
         class_addMethod(kvoClass, method_getName(method), method_getImplementation(method), "");
     }
 
+    if ([_targetObject isKindOfClass:[CPDictionary class]])
+    {
+        var methodList = _CPKVOModelDictionarySubclass.method_list,
+            count = methodList.length;
+
+        for (var i=0; i<count; i++)
+        {
+            var method = methodList[i];
+            class_addMethod(kvoClass, method_getName(method), method_getImplementation(method), "");
+        }
+    }
+
     _targetObject.isa = kvoClass;
 }
 
@@ -565,6 +577,56 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
 
 @end
 
+@implementation _CPKVOModelDictionarySubclass
+{
+}
+
+- (void)removeAllObjects
+{
+    var keys = [self allKeys],
+        count = [keys count];
+
+    for (var i = 0; i < count; i++)
+        [self willChangeValueForKey:keys[i]];
+
+    var superClass = [self class],
+        methodSelector = @selector(removeAllObjects),
+        methodImp = class_getMethodImplementation(superClass, methodSelector);
+
+    methodImp(self, methodSelector);
+
+    for (var i = 0; i < count; i++)
+        [self didChangeValueForKey:keys[i]];
+}
+
+- (void)removeObjectForKey:(id)aKey
+{
+    [self willChangeValueForKey:aKey];
+
+    var superClass = [self class],
+        methodSelector = @selector(removeObjectForKey:),
+        methodImp = class_getMethodImplementation(superClass, methodSelector);
+
+    methodImp(self, methodSelector, aKey);
+
+    [self didChangeValueForKey:aKey];
+}
+
+- (void)setObject:(id)anObject forKey:(id)aKey
+{
+    [self willChangeValueForKey:aKey];
+
+    var superClass = [self class],
+        methodSelector = @selector(setObject:forKey:),
+        methodImp = class_getMethodImplementation(superClass, methodSelector);
+
+    methodImp(self, methodSelector, anObject, aKey);
+
+    [self didChangeValueForKey:aKey];
+}
+
+@end
+
 @implementation _CPKVOForwardingObserver : CPObject
 {
     id          _object;
diff --git a/Tests/Foundation/CPKVOTest.j b/Tests/Foundation/CPKVOTest.j
index 01eb83205..52e093d05 100644
--- a/Tests/Foundation/CPKVOTest.j
+++ b/Tests/Foundation/CPKVOTest.j
@@ -122,6 +122,22 @@
 
 }
 
+- (void)testDictionary
+{
+    var dict = [[CPDictionary alloc] init];
+    
+    [dict setObject:@"Bob Jones" forKey:@"dictionaryKey"];
+
+    [dict addObserver:self
+           forKeyPath:@"dictionaryKey"
+             options:nil
+             context:"testDictionary"];
+
+    [dict setObject:@"Jo Bob Ray" forKey:@"dictionaryKey"];
+
+    [self assertTrue: _sawObservation message:"Never recieved an observation"];
+}
+
 - (void)testPriorObservationOption
 {
     _sawPriorObservation = NO;
@@ -611,6 +627,12 @@
             [self assert:anObject equals:bob];
             break;
 
+        case "testDictionary":
+            [self assert:aKeyPath equals:"dictionaryKey"];
+            [self assert:oldValue equals:"Bob Jones"];
+            [self assert:newValue equals:"Jo Bob Ray"];
+            break;
+
         default:
             [self assertFalse:YES message:"unhandled observation, must be an error"];
             return;