diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index 1790006e4..8f1f9c5fa 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -161,7 +161,7 @@ main(int argc, char **argv)
 	autologin = -1;
 
 	while((ch = getopt(argc, argv,
-			   "78DEKLS:X:abcde:fFk:l:n:rxG")) != EOF) {
+			   "78DEKLS:X:abcde:fFk:l:n:rxG")) != -1) {
 		switch(ch) {
 		case '8':
 			eight = 3;	/* binary output and input */
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index e1bff9b67..b021e689e 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -169,7 +169,7 @@ main(int argc, char **argv)
     highpty = getnpty();
 #endif /* CRAY */
 
-    while ((ch = getopt(argc, argv, valid_opts)) != EOF) {
+    while ((ch = getopt(argc, argv, valid_opts)) != -1) {
 	switch(ch) {
 
 #ifdef	AUTHENTICATION