diff --git a/ChangeLog b/ChangeLog
index e39c50a51..0f94397b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-09-11  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoContactLDAPFolder.m
+	([SOGoContactLDAPFolder
+	+folderWithName:aNameandDisplayName:aDisplayNameinContainer:aContainer]):
+	renamed from "contactFolderWithName..." for compatibility with SOGoFolder.
+
 	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder
 	+contactFolderWithName:aNameandDisplayName:aDisplayNameinContainer:aContainer]):
 	removed method, reimplemented in SOGoFolder.
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.h b/SoObjects/Contacts/SOGoContactLDAPFolder.h
index ad1ceb89c..e405a3faf 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.h
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.h
@@ -37,9 +37,12 @@
   BOOL ignoreSoObjectHunger;
 }
 
-- (id <SOGoContactFolder>) initWithName: (NSString *) newName
-                         andDisplayName: (NSString *) newDisplayName
-                            inContainer: (SOGoObject *) newContainer;
++ (id) folderWithName: (NSString *) aName
+       andDisplayName: (NSString *) aDisplayName
+	  inContainer: (id) aContainer;
+- (id) initWithName: (NSString *) newName
+     andDisplayName: (NSString *) newDisplayName
+	inContainer: (id) newContainer;
 - (void) setLDAPSource: (LDAPSource *) newLdapSource;
 
 @end
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index 2704be332..841a79a00 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -41,11 +41,11 @@
 
 @implementation SOGoContactLDAPFolder
 
-+ (id <SOGoContactFolder>) contactFolderWithName: (NSString *) aName
-                                  andDisplayName: (NSString *) aDisplayName
-                                     inContainer: (SOGoObject *) aContainer
++ (id) folderWithName: (NSString *) aName
+       andDisplayName: (NSString *) aDisplayName
+	  inContainer: (id) aContainer
 {
-  SOGoContactLDAPFolder *folder;
+  id folder;
 
   folder = [[self alloc] initWithName: aName
                          andDisplayName: aDisplayName
@@ -68,9 +68,9 @@
   return self;
 }
 
-- (id <SOGoContactFolder>) initWithName: (NSString *) newName
-                         andDisplayName: (NSString *) newDisplayName
-                            inContainer: (SOGoObject *) newContainer
+- (id) initWithName: (NSString *) newName
+     andDisplayName: (NSString *) newDisplayName
+	inContainer: (id) newContainer
 {
   if ((self = [self initWithName: newName
 		    inContainer: newContainer]))