diff --git a/lam/TODO b/lam/TODO
index a61bdc28..538244fe 100644
--- a/lam/TODO
+++ b/lam/TODO
@@ -9,6 +9,7 @@ beta
 - check security
 - clean up code
 - support for Samba 3.x schema
+- support for multiple organizational units under the suffixes
 
 alpha 2
 
diff --git a/lam/docs/README.openldap b/lam/docs/README.openldap
new file mode 100644
index 00000000..8e69be4f
--- /dev/null
+++ b/lam/docs/README.openldap
@@ -0,0 +1,21 @@
+Some basic hints to configure the openLDAP server:
+
+SIZELIMIT:  OpenLDAP allows by default 500 return values per search, if you have more users/groups/hosts
+            change this in slapd.conf: e.g. "sizelimit 10000" or "sizelimit -1" for unlimited return values.
+
+INDICES:  Indices will improve the performance when searching for entries in the LDAP directory.
+          The following indices are recommended:
+
+          index objectClass eq
+          index default sub
+          index uidNumber eq
+          index gidNumber eq
+          index memberUid eq
+          index cn,mail,surname,givenname eq,subinitial
+          # Samba 2.x
+          index rid eq
+          index primaryGroupID eq
+          # Samba 3.x
+          index sambaSID eq
+          index sambaPrimaryGroupSID eq
+          index sambaDomainName eq