diff --git a/ChangeLog b/ChangeLog
index 4c84b8a94..6bf488158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m
+	([SOGoContactLDAPFolder -_searchAttributes]): retrieve "calFBURL"
+	from the server.
+
+	* SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry
+	-vCard]): put the LDAP "calFBURL" field in the vCard's "FBURL"
+	entry.
+
 2007-01-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoCalendarComponent.m
diff --git a/SoObjects/Contacts/SOGoContactLDAPEntry.m b/SoObjects/Contacts/SOGoContactLDAPEntry.m
index 92f38c436..7e047e4c5 100644
--- a/SoObjects/Contacts/SOGoContactLDAPEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDAPEntry.m
@@ -182,6 +182,11 @@
         [element setValue: 3 to: location];
       if (streetAddress || location)
         [vcard addChild: element];
+      info = [ldapEntry singleAttributeWithName: @"calFBURL"];
+      if (info)
+        [vcard addChildWithTag: @"FBURL"
+               types: nil
+               singleValue: info];
     }
 
   return vcard;
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index bc4ae3a07..073055678 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -233,6 +233,7 @@
                   @"locality",
                   @"birthyear",
                   @"serialNumber",
+                  @"calFBURL",
                   nil];
 }