diff --git a/ChangeLog b/ChangeLog
index e8b090503..3e1dd012a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoContentObject.m ([SOGoContentObject
+	-PUTAction:_ctx]): when the object is new, return 201. Otherwise,
+	return 204 as success code.
+
 2008-07-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalWeekView.m ([UIxCalWeekView -startDate]):
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 002cb7d40..f0ab4f9ba 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -315,9 +315,13 @@
 	  response = [_ctx response];
 	  /* setup response */
   
-	  // TODO: this should be automatic in the SoDispatcher if we return nil?
-	  [response setStatus: 201 /* Created */];
-  
+	  // TODO: this should be automatic in the SoDispatcher if we return
+	  // nil?
+	  if (isNew)
+	    [response setStatus: 201 /* Created */];
+	  else
+	    [response setStatus: 204 /* No Content */];
+ 
 	  etag = [self davEntityTag];
 	  if (etag)
 	    {