diff --git a/src/usr.sbin/ntpd/ntpd.8 b/src/usr.sbin/ntpd/ntpd.8
index 5e136243..f3e4570d 100644
--- a/src/usr.sbin/ntpd/ntpd.8
+++ b/src/usr.sbin/ntpd/ntpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ntpd.8,v 1.7 2004/09/18 20:31:46 henning Exp $
+.\" $OpenBSD: ntpd.8,v 1.8 2004/09/18 20:37:12 henning Exp $
 .\"
 .\" Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
 .\"
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm ntpd
 .Bk -words
-.Op Fl ds
+.Op Fl dsS
 .Op Fl f Ar file
 .Ek
 .Sh DESCRIPTION
@@ -80,6 +80,9 @@ Set the time immediately once at startup if the local clock is off by more
 than 180 seconds. Allows for a large time correction,
 eliminating the need to run rdate before starting
 .Nm .
+.It Fl S
+Do not set the time immediately at startup.
+This is the default.
 .El
 .Sh FILES
 .Bl -tag -width "/etc/ntpd.confXXX" -compact
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 0a7ab12c..6a0ddb82 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.19 2004/09/18 20:27:57 henning Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.20 2004/09/18 20:37:12 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -68,7 +68,7 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-d] [-f file] [-s]\n", __progname);
+	fprintf(stderr, "usage: %s [-dsS] [-f file]\n", __progname);
 	exit(1);
 }
 
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
 
 	log_init(1);		/* log to stderr until daemonized */
 
-	while ((ch = getopt(argc, argv, "df:s")) != -1) {
+	while ((ch = getopt(argc, argv, "df:sS")) != -1) {
 		switch (ch) {
 		case 'd':
 			conf.debug = 1;
@@ -102,6 +102,9 @@ main(int argc, char *argv[])
 		case 's':
 			conf.settime = 1;
 			break;
+		case 'S':
+			conf.settime = 0;
+			break;
 		default:
 			usage();
 			/* NOTREACHED */