diff --git a/ChangeLog b/ChangeLog
index eaf5fd943..f182314d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoDefaultsSource.m
+	(-migrateOldDefaultsWithDictionary:): when migrating between two
+	existing keys, the migration is not interrupted if both values are
+	the same.
+
 2009-11-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserManager.m
diff --git a/SoObjects/SOGo/SOGoDefaultsSource.m b/SoObjects/SOGo/SOGoDefaultsSource.m
index 2769af252..c12086769 100644
--- a/SoObjects/SOGo/SOGoDefaultsSource.m
+++ b/SoObjects/SOGo/SOGoDefaultsSource.m
@@ -213,9 +213,10 @@ NSString *SOGoDefaultsSourceUnmutableSource = @"SOGoDefaultsSourceUnmutableSourc
         {
           newName = [migratedKeys objectForKey: oldName];
           existingValue = [source objectForKey: newName];
-          if (existingValue)
+          if (existingValue && ![existingValue isEqual: currentValue])
             [self errorWithFormat: @"both old and new defaults key"
-                  @" '%@' '%@' exist. Migration skipped.", oldName, newName];
+                  @" ('%@' and '%@') exist with a different value."
+                  @" Migration skipped.", oldName, newName];
           else
             {
               requireSync = YES;