diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index c707a5b53..bc7d3f2bb 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -368,6 +368,7 @@ main(int argc, char **argv)
 #endif
 	}
 	mini_inetd (port);
+	setlinebuf(stdout);
     } else if (argc > 0) {
 	usage();
 	/* NOT REACHED */
@@ -746,6 +747,15 @@ Please contact your net administrator");
 #endif
 
     init_env();
+
+    /* begin server processing */
+
+    /*
+     * Initialize the slc mapping table.
+     */
+
+    get_slc_defaults();
+
     /*
      * get terminal type.
      */
@@ -762,7 +772,6 @@ Please contact your net administrator");
     }
 #endif	/* _SC_CRAY_SECURE_SYS */
 
-    /* begin server processing */
     my_telnet(net, ourpty, remote_host_name, remote_utmp_name,
 	      level, user_name);
     /*NOTREACHED*/
@@ -809,11 +818,6 @@ my_telnet(int f, int p, const char *host, const char *utmp_host,
     int startslave_called = 0;
     time_t timeout;
 
-    /*
-     * Initialize the slc mapping table.
-     */
-    get_slc_defaults();
-
     /*
      * Do some tests where it is desireable to wait for a response.
      * Rather than doing them slowly, one at a time, do them all