diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index e781a680..45062638 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.41 2010/04/22 17:43:30 ratchov Exp $
+#	$OpenBSD: ftpusers,v 1.42 2010/06/03 17:49:47 martinh Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -51,3 +51,4 @@ _rwalld
 _nsd
 _ldpd
 _sndio
+_ldapd
diff --git a/src/etc/group b/src/etc/group
index 369dfa23..be5c1f71 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -64,6 +64,7 @@ _rwalld:*:96:
 _nsd:*:97:
 _ldpd:*:98:
 _sndio:*:99:
+_ldapd:*:100:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index ee17f276..2ec7b918 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.33 2010/04/22 17:43:30 ratchov Exp $
+#	$OpenBSD: aliases,v 1.34 2010/06/03 17:49:47 martinh Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -33,6 +33,7 @@ _identd: /dev/null
 _isakmpd: /dev/null
 _kadmin: /dev/null
 _kdc: /dev/null
+_ldapd: /dev/null
 _ldpd: /dev/null
 _mopd: /dev/null
 _nsd: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 9140e01e..16f7faa5 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -46,4 +46,5 @@ _rwalld:*:96:96::0:0:rpc.rwalld:/var/empty:/sbin/nologin
 _nsd:*:97:97::0:0:NSD Daemon:/var/empty:/sbin/nologin
 _ldpd:*:98:98::0:0:LDP Daemon:/var/empty:/sbin/nologin
 _sndio:*:99:99::0:0:sndio privsep:/var/empty:/sbin/nologin
+_ldapd:*:100:100::0:0:LDAP Daemon:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user for NFS:/nonexistent:/sbin/nologin