diff --git a/usr.bin/ncplist/ncplist.c b/usr.bin/ncplist/ncplist.c
index e91f2312e4ad..e2c2ce4133c0 100644
--- a/usr.bin/ncplist/ncplist.c
+++ b/usr.bin/ncplist/ncplist.c
@@ -380,7 +380,7 @@ main(int argc, char *argv[])
 	bzero(args, sizeof(args));
 
 	what = LO_NONE;
-	while ((opt = getopt(argc, argv, "h")) != EOF) {
+	while ((opt = getopt(argc, argv, "h")) != -1) {
 		switch (opt) {
 		    case 'h': case '?':
 			help();
diff --git a/usr.bin/ncplogin/ncplogin.c b/usr.bin/ncplogin/ncplogin.c
index 7bc2f66267ad..16e5268495fe 100644
--- a/usr.bin/ncplogin/ncplogin.c
+++ b/usr.bin/ncplogin/ncplogin.c
@@ -69,7 +69,7 @@ static void
 login(int argc, char *argv[], struct ncp_conn_loginfo *li) {
 	int error = 0, connid, opt, setprimary = 0;
 
-	while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != EOF){
+	while ((opt = getopt(argc, argv, STDPARAM_OPT"D")) != -1) {
 		switch(opt){
 		    case STDPARAM_ARGS:
 			if (ncp_li_arg(li, opt, optarg))	
diff --git a/usr.sbin/apmd/apmd.c b/usr.sbin/apmd/apmd.c
index 0b8ef93fb2f3..67351f82d517 100644
--- a/usr.sbin/apmd/apmd.c
+++ b/usr.sbin/apmd/apmd.c
@@ -650,7 +650,7 @@ main(int ac, char* av[])
 	char	*prog;
 	int	logopt = LOG_NDELAY | LOG_PID;
 
-	while ((ch = getopt(ac, av, "df:sv")) != EOF) {
+	while ((ch = getopt(ac, av, "df:sv")) != -1) {
 		switch (ch) {
 		case 'd':
 			daemonize = 0;
diff --git a/usr.sbin/apmd/contrib/pccardq.c b/usr.sbin/apmd/contrib/pccardq.c
index 1562c55f0620..e619770e1e83 100644
--- a/usr.sbin/apmd/contrib/pccardq.c
+++ b/usr.sbin/apmd/contrib/pccardq.c
@@ -36,7 +36,7 @@ proc_arg(int ac, char **av)
 
     tmp_dir = getenv("TMPDIR") ? getenv("TMPDIR") : tmp_dir;
 
-    while ((ch = getopt(ac, av, "ans:")) != EOF) {
+    while ((ch = getopt(ac, av, "ans:")) != -1) {
 	switch (ch) {
 	case 'a':
 	    slot_map = ~0;