diff --git a/ChangeLog b/ChangeLog
index 9e9f2a87a..324e49ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-12-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder +webdavAclManager]): same as below.
+
+	* SoObjects/Appointments/SOGoAppointmentObject.m
+	([SOGoAppointmentObject +webdavAclManager]): same as below.
+
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder +webdavAclManager]):
+	same as below.
+
+	* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
+	+webdavAclManager]): same as below.
+
+	* SoObjects/SOGo/SOGoObject.m ([SOGoObject +webdavAclManager]):
+	same as below.
+
+	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
+	+webdavAclManager]): declare singleton as static to avoid leaking.
+
 2008-12-09  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentObject.m
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index cb73f2957..1fba2ed24 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -127,7 +127,7 @@ static Class sogoAppointmentFolderKlass = Nil;
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *aclManager = nil;
+  static SOGoWebDAVAclManager *aclManager = nil;
   NSString *nsI;
 
   if (!aclManager)
@@ -1071,7 +1071,6 @@ static Class sogoAppointmentFolderKlass = Nil;
   NSString **values, **currentValue;
   SoSecurityManager *mgr;
   SEL methodSel;
-  Class c;
 
 #warning things may crash here...
   values = calloc (100, sizeof (NSMutableString *));
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 24ec497d1..cedb5dec3 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -58,7 +58,7 @@
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *aclManager = nil;
+  static SOGoWebDAVAclManager *aclManager = nil;
   NSString *nsD, *nsI;
 
   if (!aclManager)
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 4c51fc004..244583e42 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -46,7 +46,7 @@
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *webdavAclManager = nil;
+  static SOGoWebDAVAclManager *webdavAclManager = nil;
 
   if (!webdavAclManager)
     {
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 2bc01800a..21d0176d7 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -73,7 +73,7 @@ static NSArray *childRecordFields = nil;
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *aclManager = nil;
+  static SOGoWebDAVAclManager *aclManager = nil;
 
   if (!aclManager)
     {
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index c760701eb..35210485d 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -54,7 +54,7 @@ static SoSecurityManager *sm = nil;
 
 + (SOGoWebDAVAclManager *) webdavAclManager
 {
-  SOGoWebDAVAclManager *aclManager = nil;
+  static SOGoWebDAVAclManager *aclManager = nil;
 
   if (!aclManager)
     {