diff --git a/ChangeLog b/ChangeLog
index 7b8ed1afb..195bbe157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoGCSFolder.m (-renameTo:): when the active
+	user is a super user, we modify the real owner's version of the
+	displayname.
+
 	* Tests/Integration/webdavlib.py
 	(_WD_XMLTreeElement.appendSubtree): added handling of unicode
 	subtrees
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 9e39d99b4..c51901a96 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -535,11 +535,16 @@ static NSArray *childRecordFields = nil;
 
 - (void) renameTo: (NSString *) newName
 {
+  SOGoUser *activeUser;
+
 #warning SOGoFolder should have the corresponding method
   [displayName release];
   displayName = nil;
 
-  if (activeUserIsOwner)
+  activeUser = [context activeUser];
+  if (activeUserIsOwner
+      || ([activeUser respondsToSelector: @selector (isSuperUser)]
+          && [activeUser isSuperUser]))
     [self _ownerRenameTo: newName];
   else
     [self _subscriberRenameTo: newName];