diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf
index 543bcd10be..f31baf29e8 100644
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
@@ -14,17 +14,12 @@ include		%SYSCONFDIR%/schema/core.schema
 pidfile		%LOCALSTATEDIR%/slapd.pid
 argsfile	%LOCALSTATEDIR%/slapd.args
 
-# Load dynamic backend modules
-
+# Load dynamic backend modules:
 # modulepath	%MODULEDIR%
-# moduleload	back_bdb2.la
 # moduleload	back_ldap.la
 # moduleload	back_ldbm.la
 # moduleload	back_passwd.la
-# moduleload	back_perl.la
 # moduleload	back_shell.la
-# moduleload	back_bdb2.la
-# moduleload	back_tcl.la
 
 #######################################################################
 # ldbm database definitions
@@ -35,10 +30,12 @@ suffix		"dc=my-domain, dc=com"
 #suffix		"o=My Organization Name, c=US"
 rootdn		"cn=Manager, dc=my-domain, dc=com"
 #rootdn		"cn=Manager, o=My Organization Name, c=US"
-# cleartext passwords, especially for the rootdn, should
+# Cleartext passwords, especially for the rootdn, should
 # be avoid.  See slappasswd(8) and slapd.conf(5) for details.
+# Use of strong authentication encouraged.
 rootpw		secret
-# database directory
-# this directory MUST exist prior to running slapd AND 
+# The database directory MUST exist prior to running slapd AND 
 # should only be accessable by the slapd/tools. Mode 700 recommended.
 directory	%LOCALSTATEDIR%/openldap-ldbm
+# Indices to maintain
+index	objectClass	eq