diff --git a/ChangeLog b/ChangeLog
index 1a5deaa47..e8fb8b293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
 2006-09-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactGCSEntry.m ([SOGoContactGCSEntry
+	-vCard]): create a new NGVCard instance when no data is available
+	and retain it.
+	([SOGoContactGCSEntry -save]): save the vCard using the new
+	"versitString" API method/message.
+
 	* UI/Contacts/UIxContactView.h: separated interface from
 	UIxContactView.m.
 
-	* UI/WebServerResources/ContactsUI.js: added code to download card
+	* UI/WebServerResources/ContactsUI.js: add-ed code to download card
 	views and display them beneath the list.
 
 2006-09-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.m b/SoObjects/Contacts/SOGoContactGCSEntry.m
index 265804443..13a8541f7 100644
--- a/SoObjects/Contacts/SOGoContactGCSEntry.m
+++ b/SoObjects/Contacts/SOGoContactGCSEntry.m
@@ -22,9 +22,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSString.h>
 
-#import <NGiCal/NGVCard.h>
-
-#import "NGVCard+Contact.h"
+#import <NGCards/NGVCard.h>
 
 #import "SOGoContactGCSEntry.h"
 
@@ -40,6 +38,13 @@
   return self;
 }
 
+- (void) dealloc
+{
+  if (card)
+    [card release];
+  [super dealloc];
+}
+
 /* content */
 
 - (NGVCard *) vCard
@@ -54,8 +59,15 @@
         {
           cards = [NGVCard parseVCardsFromSource: contentStr];
           if ([cards count] > 0)
-            card = [cards objectAtIndex: 0];
+            {
+              card = [cards objectAtIndex: 0];
+              [card retain];
+            }
+          else
+            card = [NGVCard new];
         }
+      else
+        card = [NGVCard new];
     }
 
   return card;
@@ -76,7 +88,7 @@
 
   vcard = [self vCard];
 
-  return [self saveContentString: [vcard asString]];
+  return [self saveContentString: [vcard versitString]];
 }
 
 /* message type */