diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index b8539d81e35e..1b42685245fc 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -57,7 +57,9 @@ Allow write access to observed tty.
 .It Ar tty
 Tty may be specified as an tty-style device, such as a pseudo tty device,
 a virtual console, or a serial line, etc.
-Names may be preceded by "/dev/".
+Names may be preceded by
+.Pa /dev/ .
+.El
 .Sh OPERATION
 While running in interactive mode, all user input is discarded except for:
 .Pp
@@ -69,6 +71,7 @@ Exit
 Clear screen.
 .It Sy "<control-X>"
 Change attached tty.
+.El
 .Sh RESTRICTIONS
 Only the superuser can run
 .Nm Ns .
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index a9e262987c55..817f7fc8c03b 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -288,7 +288,6 @@ main(ac, av)
 	char          **av;
 {
 	int             res, nread, b_size = MIN_SIZE;
-	extern int      optind;
 	char            ch, *buf, chb[READB_LEN];
 	fd_set          fd_s;
 
@@ -426,5 +425,6 @@ main(ac, av)
 				fatal(EX_IOERR, "write failed");
 		}
 	}			/* While */
+	return(0);
 }