diff -u openldap-2.4.25/debian/slapd.scripts-common openldap-2.4.25/debian/slapd.scripts-common
--- openldap-2.4.25/debian/slapd.scripts-common
+++ openldap-2.4.25/debian/slapd.scripts-common
@@ -476,7 +476,8 @@
 	echo -n "  Creating initial configuration... " >&2
 
 	# Create the slapd.d directory.
-	mkdir ${SLAPD_CONF}
+	rm -rf ${SLAPD_CONF}/cn=config ${SLAPD_CONF}/cn=config.ldif
+	mkdir -p ${SLAPD_CONF}
 	initldif=`mktemp -t slapadd.XXXXXX`
 	cat /usr/share/slapd/slapd.init.ldif > ${initldif}
 
diff -u openldap-2.4.25/debian/changelog openldap-2.4.25/debian/changelog
--- openldap-2.4.25/debian/changelog
+++ openldap-2.4.25/debian/changelog
@@ -1,3 +1,10 @@
+openldap (2.4.25-1.1) unstable; urgency=low
+
+  * Non-maintainer upload to fix RC bug.
+  * Fix "dpkg-reconfigure slapd". Closes: #596343
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Tue, 31 May 2011 11:57:29 +0200
+
 openldap (2.4.25-1) unstable; urgency=low
 
   * New upstream version (Closes: #617606, #618904, #606815, #608813)