diff --git a/ChangeLog b/ChangeLog
index fe4b3dd71..003a932d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry
+	-vCard]): mark address returned from LDAP as the work address.
+
 	* UI/Templates/SchedulerUI/UIxCalInlineAptView.wox: made the whole
 	span covered with the anchor, not only the textual information
 	within.
diff --git a/SoObjects/Contacts/SOGoContactLDAPEntry.m b/SoObjects/Contacts/SOGoContactLDAPEntry.m
index 3f968aaf8..92f38c436 100644
--- a/SoObjects/Contacts/SOGoContactLDAPEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDAPEntry.m
@@ -175,6 +175,7 @@
       location = [ldapEntry singleAttributeWithName: @"l"];
       element = [CardElement elementWithTag: @"adr"
                              attributes: nil values: nil];
+      [element setValue: 0 ofAttribute: @"type" to: @"work"];
       if (streetAddress)
         [element setValue: 2 to: streetAddress];
       if (location)
@@ -182,7 +183,7 @@
       if (streetAddress || location)
         [vcard addChild: element];
     }
-              
+
   return vcard;
 }