diff --git a/ChangeLog b/ChangeLog
index 31f198023..6a9dd0b67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Common/UIxAclEditor.m ([UIxAclEditor -saveAclsAction]): added
+	code to handle the publishing of freebusy information.
+
 2006-12-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalMainView.m ([UIxCalMainView
diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m
index 128104485..cb8cdb0bd 100644
--- a/UI/Common/UIxAclEditor.m
+++ b/UI/Common/UIxAclEditor.m
@@ -39,6 +39,7 @@
     {
       acls = nil;
       prepared = NO;
+      publishInFreeBusy = NO;
       users = [NSMutableArray new];
       checkedUsers = [NSMutableArray new];
       ownerCN = nil;
@@ -94,7 +95,9 @@
   while (currentAcl)
     {
       currentUID = [currentAcl objectForKey: @"c_uid"];
-      if (![currentUID isEqualToString: @"freebusy"])
+      if ([currentUID isEqualToString: @"freebusy"])
+        publishInFreeBusy = YES;
+      else
         {
           currentUser = [um iCalPersonWithUid: currentUID];
           if (![[currentUser cn] isEqualToString: [self ownerCN]])
@@ -127,15 +130,30 @@
   return checkedUsers;
 }
 
+- (BOOL) publishInFreeBusy
+{
+  if (!prepared)
+    [self _prepareUsers];
+
+  return publishInFreeBusy;
+}
+
 - (NSString *) toolbar
 {
   return (([[self ownerCN] isEqualToString: [[context activeUser] login]])
           ? @"SOGoAclOwner.toolbar" : @"SOGoAclAssistant.toolbar");
 }
 
+- (BOOL) clientIsCalendar
+{
+  return [NSStringFromClass ([[self clientObject] class])
+                            isEqualToString: @"SOGoAppointmentFolder"];
+}
+
 - (id) saveAclsAction
 {
   NSString *uids;
+  NSArray *fbUsers;
   WORequest *request;
   SOGoAclsFolder *folder;
   SOGoObject *clientObject;
@@ -151,6 +169,15 @@
   [folder setRoleForObject: clientObject
           forUsers: [uids componentsSeparatedByString: @","]
           to: SOGoRole_Assistant];
+  if ([self clientIsCalendar]) {
+    if ([[request formValueForKey: @"freebusy"] intValue])
+      fbUsers = [NSArray arrayWithObject: @"freebusy"];
+    else
+      fbUsers = nil;
+    [folder setRoleForObject: clientObject
+            forUsers: fbUsers
+            to: SOGoRole_FreeBusy];
+  }
 
   return [self jsCloseWithRefreshMethod: nil];
 }