diff --git a/ChangeLog b/ChangeLog
index cda471ca2..c626e6580 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m (bareFetchFields:): Handled
 	the Exception when all conditions are nil.
+	* SoObjects/Contacts/NGVCard+SOGo.m (ldifString): Made corrections
+	reflecting from the fixes in NGVCard to properly format an address.
 
 2009-09-23  Cyril Robert <crobert@inverse.ca>
 
diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 1e73e0b00..7f0a72dc5 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -101,11 +101,12 @@
   if ([array count])
     {
       tmp = [array objectAtIndex: 0];
-      [entry setObject: [tmp value: 0] forKey: @"homeStreet"];
-      [entry setObject: [tmp value: 1] forKey: @"mozillaHomeLocalityName"];
-      [entry setObject: [tmp value: 2] forKey: @"mozillaHomeState"];
-      [entry setObject: [tmp value: 3] forKey: @"mozillaHomePostalCode"];
-      [entry setObject: [tmp value: 4] forKey: @"mozillaHomeCountryName"];
+      [entry setObject: [tmp value: 1] forKey: @"mozillaHomeStreet2"];
+      [entry setObject: [tmp value: 2] forKey: @"homeStreet"];
+      [entry setObject: [tmp value: 3] forKey: @"mozillaHomeLocalityName"];
+      [entry setObject: [tmp value: 4] forKey: @"mozillaHomeState"];
+      [entry setObject: [tmp value: 5] forKey: @"mozillaHomePostalCode"];
+      [entry setObject: [tmp value: 6] forKey: @"mozillaHomeCountryName"];
     }
 
   array = [self org];
@@ -116,11 +117,12 @@
   if ([array count])
     {
       tmp = [array objectAtIndex: 0];
-      [entry setObject: [tmp value: 0] forKey: @"street"];
-      [entry setObject: [tmp value: 1] forKey: @"l"];
-      [entry setObject: [tmp value: 2] forKey: @"st"];
-      [entry setObject: [tmp value: 3] forKey: @"postalCode"];
-      [entry setObject: [tmp value: 4] forKey: @"c"];
+      [entry setObject: [tmp value: 1] forKey: @"mozillaWorkStreet2"];
+      [entry setObject: [tmp value: 2] forKey: @"street"];
+      [entry setObject: [tmp value: 3] forKey: @"l"];
+      [entry setObject: [tmp value: 4] forKey: @"st"];
+      [entry setObject: [tmp value: 5] forKey: @"postalCode"];
+      [entry setObject: [tmp value: 6] forKey: @"c"];
     }
 
   array = [self childrenWithTag: @"tel" andAttribute: @"type" havingValue: @"work"];