diff --git a/ChangeLog b/ChangeLog
index 6dcaa2635..940c129d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactLDAPEntry.m ([SOGoContactLDAPEntry
+	-vCard]): handle the "streetAddress" and "l" fields.
+
 	* UI/Templates/MailerUI/UIxMailEditor.wox: arranged the message
 	header fields by converting the tables to DIVs and SPANs.
 
diff --git a/SoObjects/Contacts/SOGoContactLDAPEntry.m b/SoObjects/Contacts/SOGoContactLDAPEntry.m
index a3ae1795b..343b1b393 100644
--- a/SoObjects/Contacts/SOGoContactLDAPEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDAPEntry.m
@@ -133,8 +133,8 @@
 
 - (NGVCard *) vCard
 {
-  NSString *info;
-  NSString *surname;
+  NSString *info, *surname, *streetAddress, *location;
+  CardElement *element;
 
   if (!vcard)
     {
@@ -169,6 +169,16 @@
         [vcard addEmail: info
                types: [NSArray arrayWithObjects: @"internet", @"pref", nil]];
       [self _setPhonesOfVCard: vcard];
+      streetAddress = [ldapEntry singleAttributeWithName: @"streetAddress"];
+      location = [ldapEntry singleAttributeWithName: @"l"];
+      element = [CardElement elementWithTag: @"adr"
+                             attributes: nil values: nil];
+      if (streetAddress)
+        [element setValue: 2 to: streetAddress];
+      if (location)
+        [element setValue: 3 to: location];
+      if (streetAddress || location)
+        [vcard addChild: element];
     }
               
   return vcard;