diff --git a/src/etc/Makefile b/src/etc/Makefile
index 67383554..0c7fc1cd 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.287 2010/03/23 21:31:02 espie Exp $
+#	$OpenBSD: Makefile,v 1.288 2010/06/05 17:29:14 martinh Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -101,6 +101,7 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 sasyncd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 snmpd.conf ${DESTDIR}/etc
+	${INSTALL} -c -o root -g wheel -m 600 ldapd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev
 	cd root; \
@@ -248,6 +249,7 @@ distribution-etc-root-var: distrib-dirs
 	cd ../gnu/usr.bin/lynx && exec ${MAKE} -f Makefile.bsd-wrapper distribution
 	cd ../usr.bin/bgplg && exec ${MAKE} distribution
 	cd ../usr.bin/mail && exec ${MAKE} distribution
+	cd ../usr.sbin/ldapd && exec ${MAKE} distribution
 	cd mail && exec ${MAKE} distribution
 	${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
 	    ${DESTDIR}/var/mail/root
diff --git a/src/etc/ldapd.conf b/src/etc/ldapd.conf
new file mode 100644
index 00000000..3bf202fc
--- /dev/null
+++ b/src/etc/ldapd.conf
@@ -0,0 +1,18 @@
+#	$OpenBSD: ldapd.conf,v 1.1 2010/06/05 17:29:14 martinh Exp $
+
+include "/etc/ldap/core.schema"
+include "/etc/ldap/inetorgperson.schema"
+include "/etc/ldap/nis.schema"
+
+listen on lo0
+listen on "/var/run/ldapi"
+
+#namespace "dc=example,dc=com" {
+#	rootdn		"cn=admin,dc=example,dc=com"
+#	rootpw		"secret"
+#	index		sn
+#	index		givenName
+#	index		cn
+#	index		mail
+#}
+
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 4d96a615..41d19f5a 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.204 2010/05/17 18:14:47 naddy Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.205 2010/06/05 17:29:14 martinh Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -115,6 +115,17 @@ kerberosV
 # ./etc/kerberosV
 ..
 
+# ./etc/ldap
+ldap
+
+# ./etc/ldap/certs
+certs		mode=0700
+# ./etc/ldap/certs
+..
+
+# ./etc/ldap
+..
+
 # ./etc/mail
 mail
 # ./etc/mail
@@ -2331,6 +2342,11 @@ tabs		gname=crontab mode=01730
 # ./var/db
 db
 
+# ./var/db/ldap
+ldap		mode=0700
+# ./var/db/ldap
+..
+
 # ./var/db/ns
 ns
 # ./var/db/ns