diff --git a/src/etc/rc b/src/etc/rc
index 09c5d701..f323db4c 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.339 2010/07/13 12:28:13 sthen Exp $
+#	$OpenBSD: rc,v 1.340 2010/07/27 08:37:33 martinh Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -718,6 +718,10 @@ if [ X"${lpd_flags}" != X"NO" ]; then
 	echo -n ' lpd';			lpd ${lpd_flags}
 fi
 
+if [ X"${ldapd_flags}" != X"NO" ]; then
+	echo -n ' ldapd';		/usr/sbin/ldapd ${ldapd_flags};
+fi
+
 # We call sendmail with a full path so that SIGHUP works.
 # Note that /usr/sbin/sendmail may actually call a
 # mailer other than sendmail, depending on /etc/mailer.conf.
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index cae37d85..393df074 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.137 2010/06/28 20:16:21 reyk Exp $
+#	$OpenBSD: rc.conf,v 1.138 2010/07/27 08:37:33 martinh Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -45,6 +45,7 @@ relayd_flags=NO		# for normal use: ""
 snmpd_flags=NO		# for normal use: ""
 smtpd_flags=NO		# for normal use: ""
 aucat_flags=NO		# for normal use: ""
+ldapd_flags=NO		# for normal use: ""
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))