diff --git a/src/etc/Makefile b/src/etc/Makefile
index 7bea3d53..fffeaf7d 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.299 2011/07/07 02:22:11 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.300 2011/07/07 21:00:59 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -32,11 +32,11 @@ BIN2=	motd
 
 # -r-xr-xr-x
 RCDAEMONS=	apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \
-		hostapd hotplugd httpd identd ifstated iked inetd isakmpd ldapd \
-		ldattach ldpd lpd mopd mrouted named nsd ntpd portmap rarpd \
-		rbootd relayd  ripd route6d rtadvd rtsold rwhod sasyncd sendmail \
-		sensorsd smtpd snmpd sshd syslogd timed watchdogd ypbind ypldap \
-		yppasswdd ypserv
+		hostapd hotplugd httpd identd ifstated iked inetd isakmpd \
+		ldapd ldattach ldpd lpd mopd mrouted named nsd ntpd portmap \
+		rarpd rbootd relayd ripd route6d rtadvd rtsold rwhod sasyncd \
+		sendmail sensorsd smtpd snmpd sshd syslogd watchdogd ypbind \
+		ypldap yppasswdd ypserv
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz \
 	man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz
diff --git a/src/etc/rc b/src/etc/rc
index 79e186ab..e6110ecd 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.357 2011/07/07 20:54:05 deraadt Exp $
+#	$OpenBSD: rc,v 1.358 2011/07/07 21:00:59 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -435,12 +435,12 @@ if [ X"${amd}" = X"YES" -a -e ${amd_master} ]; then
 	(cd /etc/amd; amd `cat ${amd_master}`)
 fi
 
-# run rdate before timed/ntpd
+# run rdate before ntpd
 if [ X"${rdate_flags}" != X"NO" ]; then
 	echo -n ' rdate';	rdate -s ${rdate_flags}
 fi
 
-start_daemon timed ldattach ntpd
+start_daemon ldattach ntpd
 
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 3f8f56a1..536eefc8 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.145 2011/07/07 18:17:50 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.146 2011/07/07 21:00:59 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -18,7 +18,6 @@ sshd_flags=""		# for normal use: ""
 named_flags=NO		# for normal use: ""
 nsd_flags=NO		# for normal use: ""
 rdate_flags=NO		# for normal use: [RFC868-host] or [-n RFC2030-host]
-timed_flags=NO		# for normal use: ""
 ldattach_flags=NO	# for normal use: "[options] linedisc cua-device"
 ntpd_flags=NO		# for normal use: ""
 isakmpd_flags=NO	# for normal use: ""
diff --git a/src/etc/rc.d/timed b/src/etc/rc.d/timed
deleted file mode 100644
index b0e7b214..00000000
--- a/src/etc/rc.d/timed
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: timed,v 1.1 2011/07/06 18:55:36 robert Exp $
-
-daemon="/usr/sbin/timed"
-
-. /etc/rc.d/rc.subr
-
-rc_reload=NO
-
-rc_cmd $1
diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
index 27ad87b7..0e06827e 100644
--- a/src/usr.sbin/ntpd/ntpd.8
+++ b/src/usr.sbin/ntpd/ntpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.8,v 1.27 2009/02/12 01:33:37 stevesk Exp $
+.\" $OpenBSD: ntpd.8,v 1.28 2011/07/07 21:00:59 deraadt Exp $
 .\"
 .\" Copyright (c) 2003, 2004, 2006 Henning Brauer <henning@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: February 12 2009 $
+.Dd $Mdocdate: July 7 2011 $
 .Dt NTPD 8
 .Os
 .Sh NAME
@@ -137,7 +137,6 @@ Drift file.
 .Xr rc 8 ,
 .Xr rc.conf 8 ,
 .Xr rdate 8 ,
-.Xr timed 8
 .Rs
 .%R RFC 1305
 .%T "Network Time Protocol (Version 3)"