diff --git a/ChangeLog b/ChangeLog
index 5d1ea6e6a..ac479d260 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject -davURL])
+	([SOGoObject -soURL]): adjusted last change by checking that the
+	port returned initially is not nil before initializing the
+	returned NSURL.
+
 2008-10-15  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Contacts/UIxContactEditor.m ([_setupEmailFields]): avoid
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 6a2bbf7c0..51fcfae78 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -1165,6 +1165,7 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
   NSURL *serverURL, *url;
   NSMutableArray *path;
   NSString *baseURL, *urlMethod, *fullHost;
+  NSNumber *port;
 
   serverURL = [context serverURL];
   baseURL = [[self baseURLInContext: context] stringByUnescapingURL];
@@ -1185,8 +1186,13 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 	[path insertObject: expected atIndex: 2];
     }
 
-  fullHost = [NSString stringWithFormat: @"%@:%@",
-		       [serverURL host], [serverURL port]];
+  port = [serverURL port];
+  if (port)
+    fullHost = [NSString stringWithFormat: @"%@:%@",
+			 [serverURL host], port];
+  else
+    fullHost = [serverURL host];
+
   url = [[NSURL alloc] initWithScheme: [serverURL scheme]
 		       host: fullHost
 		       path: [path componentsJoinedByString: @"/"]];