diff -u --recursive freeciv.upstream/server/civserver.c freeciv/server/civserver.c
--- freeciv.upstream/server/civserver.c	Tue May  9 12:32:20 2000
+++ freeciv/server/civserver.c	Tue May  9 15:41:12 2000
@@ -172,6 +172,7 @@
   struct timer *eot_timer;	/* time server processing at end-of-turn */
 
   init_nls();
+  setvbuf(stdout, NULL, _IONBF, 0); /* ensure timely updates */
   dont_run_as_root(argv[0], "freeciv_server");
 
   sz_strlcpy(metaserver_info_line, DEFAULT_META_SERVER_INFO_STRING);
@@ -283,8 +284,6 @@
   con_puts(C_COMMENT, "");
 #endif
   
-  con_flush();
-
   init_our_capability();
   game_init();
 
diff -u --recursive freeciv.upstream/server/console.c freeciv/server/console.c
--- freeciv.upstream/server/console.c	Wed Jan  5 05:55:36 2000
+++ freeciv/server/console.c	Tue May  9 15:38:05 2000
@@ -52,7 +52,6 @@
     return;
     
   con_dump(C_READY,"> ");
-  con_flush();
   console_prompt_is_showing = 1;
 }
 
@@ -142,14 +141,6 @@
     printf("%.3d %s\n", i, buf);
   console_prompt_is_showing = 0;
   con_update_prompt();
-}
-
-/************************************************************************
-Ensure timely update. 
-************************************************************************/
-void con_flush(void)
-{
-  fflush(stdout);
 }
 
 /************************************************************************
diff -u --recursive freeciv.upstream/server/console.h freeciv/server/console.h
--- freeciv.upstream/server/console.h	Sat Jun 12 02:42:00 1999
+++ freeciv/server/console.h	Tue May  9 15:38:12 2000
@@ -47,9 +47,6 @@
    ie, same as con_write, but without the format string stuff. */
 void con_puts(int i, char *str);
      
-/* ensure timely update */
-void con_flush(void);
-
 /* make sure a prompt is printed, and re-printed after every message */
 void con_prompt_on(void);
 
diff -u --recursive freeciv.upstream/server/meta.c freeciv/server/meta.c
--- freeciv.upstream/server/meta.c	Sun Mar  5 07:28:45 2000
+++ freeciv/server/meta.c	Tue May  9 15:38:26 2000
@@ -158,7 +158,6 @@
 static void metaserver_failed(void)
 {
   con_puts(C_METAERROR, _("Not reporting to the metaserver in this game."));
-  con_flush();
 }
 
 void server_open_udp(void)