diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index 62df0df44235..bfff27baa6c6 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -37,8 +37,7 @@
 .Nd set or print name of current host system
 .Sh SYNOPSIS
 .Nm
-.Op Fl f
-.Op Fl s
+.Op Fl fs
 .Op Ar name-of-host
 .Sh DESCRIPTION
 The
diff --git a/bin/hostname/hostname.c b/bin/hostname/hostname.c
index dd3f7e9970b0..7aaca9ccda70 100644
--- a/bin/hostname/hostname.c
+++ b/bin/hostname/hostname.c
@@ -58,12 +58,14 @@ main(int argc, char *argv[])
 	char *p, hostname[MAXHOSTNAMELEN];
 
 	sflag = 0;
-	while ((ch = getopt(argc, argv, "sf")) != -1)
+	while ((ch = getopt(argc, argv, "fs")) != -1)
 		switch (ch) {
 		case 'f':
-			/* On Linux, "hostname -f" prints FQDN. */
-			/* BSD "hostname" always print FQDN by
-			 * default, so we accept but ignore -f. */
+			/*
+			 * On Linux, "hostname -f" prints FQDN.
+			 * BSD "hostname" always prints FQDN by
+			 * default, so we accept but ignore -f.
+			 */
 			break;
 		case 's':
 			sflag = 1;
@@ -98,6 +100,6 @@ void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: hostname [-s] [name-of-host]\n");
+	(void)fprintf(stderr, "usage: hostname [-fs] [name-of-host]\n");
 	exit(1);
 }