diff --git a/ChangeLog b/ChangeLog
index 748dfb9d8..e00779233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-10-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m: if "displayName" is
+	empty, use "c_cn" instead.
+
 	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount -inboxFolderInContext:_ctx])
 	([SOGoMailAccount -draftsFolderInContext:_ctx])
 	([SOGoMailAccount -sentFolderInContext:_ctx]): no longer make use
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index 5f1ad9ecb..4a266c4b3 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -161,10 +161,11 @@
 		 forKey: @"c_name"];
 
       data = [oldRecord objectForKey: @"displayName"];
+      if (!data)
+	data = [oldRecord objectForKey: @"c_cn"];
       if (!data)
 	data = @"";
-      [newRecord setObject: data
-		 forKey: @"displayName"];
+      [newRecord setObject: data forKey: @"displayName"];
 
       data = [oldRecord objectForKey: @"mail"];
       if (!data)