diff -ruN openldap-2.3.34.orig/doc/man/man5/slapd-bdb.5 openldap-2.3.34/doc/man/man5/slapd-bdb.5
--- openldap-2.3.34.orig/doc/man/man5/slapd-bdb.5	2007-01-03 07:43:45 +1000
+++ openldap-2.3.34/doc/man/man5/slapd-bdb.5	2007-02-22 19:48:37 +1000
@@ -96,7 +96,7 @@
 associated indexes live.
 A separate directory must be specified for each database.
 The default is
-.BR LOCALSTATEDIR/openldap-data .
+.BR LOCALSTATEDIR/ldap/bases .
 .TP
 .B dirtyread
 Allow reads of modified but not yet committed data.
diff -ruN openldap-2.3.34.orig/doc/man/man5/slapd.conf.5 openldap-2.3.34/doc/man/man5/slapd.conf.5
--- openldap-2.3.34.orig/doc/man/man5/slapd.conf.5	2007-01-03 07:43:45 +1000
+++ openldap-2.3.34/doc/man/man5/slapd.conf.5	2007-02-22 19:48:37 +1000
@@ -1871,7 +1871,7 @@
 # The database directory MUST exist prior to
 # running slapd AND should only be accessible
 # by the slapd/tools. Mode 0700 recommended.
-directory LOCALSTATEDIR/openldap-data
+directory LOCALSTATEDIR/ldap/bases
 # Indices to maintain
 index     objectClass  eq
 index     cn,sn,mail   pres,eq,approx,sub
diff -ruN openldap-2.3.34.orig/doc/man/man5/slapd-ldbm.5 openldap-2.3.34/doc/man/man5/slapd-ldbm.5
--- openldap-2.3.34.orig/doc/man/man5/slapd-ldbm.5	2007-01-03 07:43:45 +1000
+++ openldap-2.3.34/doc/man/man5/slapd-ldbm.5	2007-02-22 19:48:37 +1000
@@ -84,7 +84,7 @@
 associated indexes live.
 A separate directory must be specified for each database.
 The default is
-.BR LOCALSTATEDIR/openldap-data .
+.BR LOCALSTATEDIR/ldap/bases .
 .TP
 .B
 index {<attrlist>|default} [pres,eq,approx,sub,<special>]
diff -ruN openldap-2.3.34.orig/doc/man/man8/slurpd.8 openldap-2.3.34/doc/man/man8/slurpd.8
--- openldap-2.3.34.orig/doc/man/man8/slurpd.8	2007-01-03 07:43:46 +1000
+++ openldap-2.3.34/doc/man/man8/slurpd.8	2007-02-22 19:48:37 +1000
@@ -120,7 +120,7 @@
 temporary files may contain sensitive information.
 This option allows you to specify the location of these temporary files. 
 The default is
-.BR LOCALSTATEDIR/openldap-slurp .
+.BR LOCALSTATEDIR/ldap/replica .
 .SH EXAMPLES
 To start 
 .I slurpd
diff -ruN openldap-2.3.34.orig/include/ldap_defaults.h openldap-2.3.34/include/ldap_defaults.h
--- openldap-2.3.34.orig/include/ldap_defaults.h	2007-01-03 07:43:46 +1000
+++ openldap-2.3.34/include/ldap_defaults.h	2007-02-22 19:48:37 +1000
@@ -47,7 +47,7 @@
 	/* location of the default slapd config file */
 #define SLAPD_DEFAULT_CONFIGFILE	LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.conf"
 #define SLAPD_DEFAULT_CONFIGDIR		LDAP_SYSCONFDIR LDAP_DIRSEP "slapd.d"
-#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "openldap-data"
+#define SLAPD_DEFAULT_DB_DIR		LDAP_RUNDIR LDAP_DIRSEP "ldap/bases"
 #define SLAPD_DEFAULT_DB_MODE		0600
 #define SLAPD_DEFAULT_UCDATA		LDAP_DATADIR LDAP_DIRSEP "ucdata"
 	/* default max deref depth for aliases */
diff -ruN openldap-2.3.34.orig/servers/slapd/Makefile.in openldap-2.3.34/servers/slapd/Makefile.in
--- openldap-2.3.34.orig/servers/slapd/Makefile.in	2007-02-22 19:48:13 +1000
+++ openldap-2.3.34/servers/slapd/Makefile.in	2007-02-22 19:48:37 +1000
@@ -430,9 +430,9 @@
 
 install-db-config: FORCE
 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
-	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/ldap/bases
 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
-		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+		$(DESTDIR)$(localstatedir)/ldap/bases/DB_CONFIG.example
 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
 		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
 
diff -ruN openldap-2.3.34.orig/servers/slapd/slapd.conf openldap-2.3.34/servers/slapd/slapd.conf
--- openldap-2.3.34.orig/servers/slapd/slapd.conf	2004-06-18 13:49:08 +1100
+++ openldap-2.3.34/servers/slapd/slapd.conf	2007-02-22 19:48:37 +1000
@@ -62,6 +62,6 @@
 # The database directory MUST exist prior to running slapd AND 
 # should only be accessible by the slapd and slap tools.
 # Mode 700 recommended.
-directory	%LOCALSTATEDIR%/openldap-data
+directory	%LOCALSTATEDIR%/ldap/bases
 # Indices to maintain
 index	objectClass	eq
diff -ruN openldap-2.3.34.orig/servers/slurpd/Makefile.in openldap-2.3.34/servers/slurpd/Makefile.in
--- openldap-2.3.34.orig/servers/slurpd/Makefile.in	2007-02-22 19:48:13 +1000
+++ openldap-2.3.34/servers/slurpd/Makefile.in	2007-02-22 19:48:37 +1000
@@ -57,7 +57,7 @@
 
 install-local-srv: FORCE
 	-$(MKDIR) $(DESTDIR)$(sbindir)
-	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-slurp
+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/ldap/replica
 	@(								\
 	    for prg in $(PROGRAMS); do					\
 		$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT)	\
diff -ruN openldap-2.3.34.orig/servers/slurpd/slurp.h openldap-2.3.34/servers/slurpd/slurp.h
--- openldap-2.3.34.orig/servers/slurpd/slurp.h	2007-01-03 07:44:12 +1000
+++ openldap-2.3.34/servers/slurpd/slurp.h	2007-02-22 19:48:37 +1000
@@ -67,7 +67,7 @@
 #define SERVICE_NAME	OPENLDAP_PACKAGE "-slurpd"
 
 /* Default directory for slurpd's private copy of replication logs */
-#define	DEFAULT_SLURPD_REPLICA_DIR	LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
+#define	DEFAULT_SLURPD_REPLICA_DIR	LDAP_RUNDIR LDAP_DIRSEP "ldap/replica"
 
 /* Default name for slurpd's private copy of the replication log */
 #define	DEFAULT_SLURPD_REPLOGFILE	"slurpd.replog"