diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile
index e22759fcc401..b7f232d090b5 100644
--- a/sbin/shutdown/Makefile
+++ b/sbin/shutdown/Makefile
@@ -3,6 +3,9 @@
 
 PROG=	shutdown
 MAN=	shutdown.8
+
+WARNS?=	6
+
 BINOWN=	root
 BINGRP=	operator
 BINMODE=4550
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index f719ebf3a2c8..81c3620a0858 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -102,10 +102,10 @@ void timeout(int);
 void timewarn(int);
 void usage(const char *);
 
+extern const char **environ;
+
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char **argv)
 {
 	char *p, *endp;
 	struct passwd *pw;
@@ -276,7 +276,6 @@ timewarn(timeleft)
 	static char hostname[MAXHOSTNAMELEN + 1];
 	FILE *pf;
 	char wcmd[MAXPATHLEN + 4];
-	extern const char **environ;
 
 	if (!first++)
 		(void)gethostname(hostname, sizeof(hostname));