diff -ru stock/Makefile freeciv/Makefile
--- stock/Makefile	Fri Feb 19 23:35:00 1999
+++ freeciv/Makefile	Fri Feb 19 21:15:05 1999
@@ -63,7 +63,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/ai/Makefile freeciv/ai/Makefile
--- stock/ai/Makefile	Fri Feb 19 23:35:10 1999
+++ freeciv/ai/Makefile	Fri Feb 19 21:15:12 1999
@@ -63,7 +63,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/client/Makefile freeciv/client/Makefile
--- stock/client/Makefile	Fri Feb 19 23:38:49 1999
+++ freeciv/client/Makefile	Fri Feb 19 21:15:14 1999
@@ -63,7 +63,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/common/Makefile freeciv/common/Makefile
--- stock/common/Makefile	Fri Feb 19 23:35:09 1999
+++ freeciv/common/Makefile	Fri Feb 19 21:15:11 1999
@@ -63,7 +63,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/config.status freeciv/config.status
--- stock/config.status	Fri Feb 19 23:34:58 1999
+++ freeciv/config.status	Fri Feb 19 21:15:02 1999
@@ -65,7 +65,7 @@
 s%@AUTOCONF@%autoconf%g
 s%@AUTOMAKE@%automake%g
 s%@AUTOHEADER@%autoheader%g
-s%@MAKEINFO@%/home/daniel/freeciv/cvs/stock/missing makeinfo%g
+s%@MAKEINFO@%/home/daniel/freeciv/cvs/freeciv/missing makeinfo%g
 s%@SET_MAKE@%%g
 s%@MAINT@%#M#%g
 s%@CLIENT_TRUE@%%g
diff -ru stock/data/Makefile freeciv/data/Makefile
--- stock/data/Makefile	Fri Feb 19 23:35:02 1999
+++ freeciv/data/Makefile	Fri Feb 19 21:15:07 1999
@@ -63,7 +63,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/data/civ1/Makefile freeciv/data/civ1/Makefile
--- stock/data/civ1/Makefile	Fri Feb 19 23:35:06 1999
+++ freeciv/data/civ1/Makefile	Fri Feb 19 21:15:09 1999
@@ -61,7 +61,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/data/classic/Makefile freeciv/data/classic/Makefile
--- stock/data/classic/Makefile	Fri Feb 19 23:35:07 1999
+++ freeciv/data/classic/Makefile	Fri Feb 19 21:15:10 1999
@@ -61,7 +61,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/data/default/Makefile freeciv/data/default/Makefile
--- stock/data/default/Makefile	Fri Feb 19 23:35:05 1999
+++ freeciv/data/default/Makefile	Fri Feb 19 21:15:08 1999
@@ -61,7 +61,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/server/Makefile freeciv/server/Makefile
--- stock/server/Makefile	Fri Feb 19 23:35:14 1999
+++ freeciv/server/Makefile	Fri Feb 19 21:15:15 1999
@@ -63,7 +63,7 @@
 CVS_DEPS = yes
 LN_S = ln -s
 MAINT = #M#
-MAKEINFO = /home/daniel/freeciv/cvs/stock/missing makeinfo
+MAKEINFO = /home/daniel/freeciv/cvs/freeciv/missing makeinfo
 PACKAGE = freeciv
 RANLIB = ranlib
 SERVER_LIBS = 
diff -ru stock/server/civserver.c freeciv/server/civserver.c
--- stock/server/civserver.c	Tue Feb 16 06:31:58 1999
+++ freeciv/server/civserver.c	Sat Feb 20 10:55:03 1999
@@ -112,6 +112,10 @@
 int races_used[R_LAST];
 int num_races_avail=R_LAST;
 
+/* Used to implement turn-based play. */
+int turnbased;
+int curr_player=0;
+
 int rand_init=0;
 
 /**************************************************************************
@@ -427,7 +431,8 @@
 /* printf("Autosettlers\n"); */
     auto_settlers(); /* moved this after ai_start_turn for efficiency -- Syela */
 /* moved after sniff_packets for even more efficiency.  What a guy I am. -- Syela */
-    before_end_year(); /* resetting David P's message window -- Syela */
+    if(!turnbased)
+      before_end_year(); /* resetting David P's message window -- Syela */
 /* and now, we must manage our remaining units BEFORE the cities that are
 empty get to refresh and defend themselves.  How totally stupid. */
     ai_start_turn(); /* Misleading name for manage_units -- Syela */
@@ -443,7 +448,8 @@
 /* printf("Sendgameinfo\n"); */
     send_game_info(0);
 /* printf("Sendyeartoclients\n"); */
-    send_year_to_clients(game.year);
+    if(!turnbased)
+      send_year_to_clients(game.year);
 /* printf("Sendinfotometaserver\n"); */
     send_server_info_to_metaserver(0);
     for(i=0;i<game.nplayers;i++)
@@ -654,11 +660,21 @@
 /**************************************************************************
 ...
 **************************************************************************/
+
+void before_end_year_player(int player)
+
+{
+  send_packet_before_end_year(game.players[player].conn);
+}
+
+/**************************************************************************
+...
+**************************************************************************/
 void before_end_year()
 {
   int i;
   for (i=0; i<game.nplayers; i++) {
-    send_packet_before_end_year(game.players[i].conn);
+    before_end_year_player(i);
   }
 }
 
@@ -714,7 +730,8 @@
 	 i, pplayer->name);
     update_player_activities(pplayer);
          /* ai unit activity has been moved UP -- Syela */
-    pplayer->turn_done=0;
+    pplayer->turn_done=turnbased;
+    /* We initialize turn_done to 1 for turnbased play, 0 for non-turnbased */
   }
   nocity_send = 0;
   for (i=0; i<game.nplayers;i++) {
@@ -723,6 +740,15 @@
   update_pollution();
   do_apollo_program();
   make_history_report();
+  if(turnbased) {
+    curr_player=0;
+    while(curr_player<game.nplayers&&
+          game.players[curr_player].ai.control)
+      curr_player++;
+    /* Jumpstart the first player: */
+    if(curr_player<game.nplayers)
+      send_year_to_client(game.year, curr_player);
+  }
 /*  printf("Turn ended.\n"); */
   return 1;
 }
@@ -845,6 +871,19 @@
     return;
   }
 
+  if(turnbased&&curr_player!=i&&
+     !(type==PACKET_ALLOC_RACE||type==PACKET_UNIT_INFO||type==PACKET_CHAT_MSG||
+       type==PACKET_REPORT_REQUEST||type==PACKET_DIPLOMACY_CANCEL_MEETING||
+       type==PACKET_DIPLOMACY_INIT_MEETING||
+       type==PACKET_DIPLOMACY_CREATE_CLAUSE||
+       type==PACKET_DIPLOMACY_REMOVE_CLAUSE||
+       type==PACKET_DIPLOMACY_ACCEPT_TREATY||
+       type==PACKET_CITY_REFRESH)) /* What does PACKET_CITY_REFRESH do? */ {
+    notify_player(pplayer, "Game: it's not your turn");
+    free(packet);
+    return;
+  }
+
   pplayer->nturns_idle=0;
 
   if(!pplayer->is_alive && type!=PACKET_CHAT_MSG)
@@ -1041,11 +1080,27 @@
 {
   int i;
 
-  for(i=0; i<game.nplayers; i++)
-    if(game.players[i].conn && game.players[i].is_alive && 
-       !game.players[i].turn_done) {
-      return 0;
+  if(!turnbased) {
+    for(i=0; i<game.nplayers; i++)
+      if(game.players[i].conn && game.players[i].is_alive && 
+         !game.players[i].turn_done) {
+        return 0;
+      }
+  }
+  else
+    if(game.players[curr_player].turn_done) {
+      curr_player++;
+      while(curr_player<game.nplayers&&
+	    game.players[curr_player].ai.control)
+	curr_player++;
+      if(curr_player<game.nplayers)
+      {
+	before_end_year(curr_player);
+	send_year_to_client(game.year, curr_player);
+        return 0;
+      }
     }
+
   force_end_of_sniff=1;
   return 1;
 }
diff -ru stock/server/gamehand.c freeciv/server/gamehand.c
--- stock/server/gamehand.c	Tue Feb 16 06:31:58 1999
+++ freeciv/server/gamehand.c	Sat Feb 20 10:53:55 1999
@@ -38,8 +38,10 @@
 extern RANDOM_TYPE RandomState[];
 extern int iRandJ, iRandK, iRandX; 
 extern int rand_init;
+extern int turnbased;
+extern int curr_player;
 
-#define SAVEFILE_OPTIONS "1.7 startoptions unirandom spacerace2 rulesets"
+#define SAVEFILE_OPTIONS "1.7 startoptions unirandom spacerace2 rulesets turnbased"
 
 /**************************************************************************
 ...
@@ -61,6 +63,8 @@
     }
   }
   for(i=0; i<game.nplayers; i++) {
+    if(turnbased)
+      game.players[i].turn_done=1;
     if(game.scenario==1 || game.scenario==2) {
       /* in a scenario, choose starting positions by race */
       x=map.start_positions[game.players[i].race].x;
@@ -90,12 +94,31 @@
     for (j=0;j<game.explorer;j++) 
       create_unit(&game.players[i], x, y, get_role_unit(L_EXPLORER,0), 0, 0, -1);
   }
+  if(turnbased)
+  {
+    game.players[0].turn_done=0;
+    curr_player=0;
+  }
 }
 
 
 /**************************************************************************
 ...
 **************************************************************************/
+
+void send_year_to_client(int year, int client)
+
+{
+  struct packet_new_year apacket;
+  apacket.year=year;
+  game.players[client].turn_done=0;
+  game.players[client].nturns_idle++;
+  send_packet_new_year(game.players[client].conn,&apacket);
+}
+
+/**************************************************************************
+...
+**************************************************************************/
 void send_year_to_clients(int year)
 {
   int i;
@@ -103,9 +126,7 @@
   apacket.year=year;
 
   for(i=0; i<game.nplayers; i++) {
-    game.players[i].turn_done=0;
-    game.players[i].nturns_idle++;
-    send_packet_new_year(game.players[i].conn, &apacket);
+    send_year_to_client(year, i);
   }
 }
 
@@ -357,6 +378,11 @@
 	map.ysize = secfile_lookup_int(file, "map.ysize");
       }
 
+      if (has_capability("turnbased", savefile_options)) {
+        turnbased = secfile_lookup_int(file, "game.turnbased");
+	curr_player = secfile_lookup_int(file, "game.currplayer");
+      }
+
       if (tmp_server_state==PRE_GAME_STATE &&
 	  map.generator == 0) { /* generator 0 = map done with map editor */
         if (has_capability("specials",savefile_options)) {
@@ -520,6 +546,8 @@
               RandomState[7*i+4],RandomState[7*i+5],RandomState[7*i+6]);
       secfile_insert_str(file,temp,name);
     }
+    secfile_insert_int(file, turnbased, "game.turnbased");
+    secfile_insert_int(file, curr_player, "game.currplayer");
      
   }
 
diff -ru stock/server/gamehand.h freeciv/server/gamehand.h
--- stock/server/gamehand.h	Sat Aug 22 06:31:29 1998
+++ freeciv/server/gamehand.h	Fri Feb 19 17:58:57 1999
@@ -16,6 +16,7 @@
 struct section_file;
 
 void init_new_game(void);
+void send_year_to_client(int year, int client);
 void send_year_to_clients(int year);
 void send_game_info(struct player *dest);
 void send_game_state(struct player *dest, int state);
diff -ru stock/server/stdinhand.c freeciv/server/stdinhand.c
--- stock/server/stdinhand.c	Sat Feb 13 06:33:57 1999
+++ freeciv/server/stdinhand.c	Fri Feb 19 18:11:28 1999
@@ -31,6 +31,7 @@
 
 extern int gamelog_level;
 extern char metaserver_info_line[256];
+extern int turnbased;
 
 void cut_player_connection(char *playername);
 void quit_game(void);
@@ -240,6 +241,13 @@
     SSET_GAME_INIT, SSET_TO_CLIENT,
     GAME_MIN_TECHLEVEL, GAME_MAX_TECHLEVEL, GAME_DEFAULT_TECHLEVEL,
     "Number of initial advances per player", "" },
+
+  { "turnbased", &turnbased,
+    SSET_GAME_INIT, SSET_TO_CLIENT,
+    0, 1, 0,
+    "Toggles turn-based play",
+    "If this option is selected, each player must complete his or her turn before\n
+     the next player can move.  AI players currently follow their own rules." },
 
 /* Various rules: these cannot be changed once the game has started. */
   { "techs", NULL,