diff --git a/ChangeLog b/ChangeLog
index 5f84b3f4e..9f195a6a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-17  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/SOGo/SOGoGCSFolder.m (-renameTo:): don't act as the
+	owner of the folder when user is a superuser.
+
 2010-09-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 35ada8f68..bab5c2725 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -586,9 +586,9 @@ static NSArray *childRecordFields = nil;
   displayName = nil;
 
   activeUser = [context activeUser];
-  if (activeUserIsOwner
-      || ([activeUser respondsToSelector: @selector (isSuperUser)]
-          && [activeUser isSuperUser]))
+  if (activeUserIsOwner)
+//      || ([activeUser respondsToSelector: @selector (isSuperUser)]
+//          && [activeUser isSuperUser]))
     [self _ownerRenameTo: newName];
   else
     [self _subscriberRenameTo: newName];