diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/client/control.c /home/dzinsli/source/freeciv/client/control.c
--- /home/dzinsli/source/freeciv-cvs/client/control.c	Wed Feb 23 15:02:27 2000
+++ /home/dzinsli/source/freeciv/client/control.c	Wed Mar  1 21:39:28 2000
@@ -166,9 +166,11 @@
   /* We have to do this ourselves, and not rely on set_unit_focus(),
    * because above we change punit_focus directly.
    */
-  if(punit_old_focus!=NULL && punit_old_focus!=punit_focus)
+  if(punit_old_focus!=NULL && punit_old_focus!=punit_focus) { 
+    if (auto_turn_done && punit_focus == NULL)
+      key_end_turn();
     refresh_tile_mapcanvas(punit_old_focus->x, punit_old_focus->y, 1);
-
+  }
   set_unit_focus(punit_focus);
 }
 
diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/client/options.c /home/dzinsli/source/freeciv/client/options.c
--- /home/dzinsli/source/freeciv-cvs/client/options.c	Wed Feb  2 20:21:00 2000
+++ /home/dzinsli/source/freeciv/client/options.c	Wed Mar  1 21:30:34 2000
@@ -43,6 +43,7 @@
 int draw_diagonal_roads=1;
 int center_when_popup_city=1;
 int concise_city_production=0;
+int auto_turn_done=0;
 int draw_map_grid=0;
 
 #define GEN_OPTION(name, description) { #name, description, &name, NULL }
@@ -60,6 +61,7 @@
   GEN_OPTION(draw_diagonal_roads,	    N_("Draw Diagonal Roads/Rails  ")),
   GEN_OPTION(center_when_popup_city,	    N_("Center map when Popup city ")),
   GEN_OPTION(concise_city_production,	    N_("Concise City Production    ")),
+  GEN_OPTION(auto_turn_done, 		    N_("Auto end turn when done moving units")),
   NULL_OPTION
 };
 
diff -u -X/home/dzinsli/source/freeciv-patches/no.freeciv -r /home/dzinsli/source/freeciv-cvs/client/options.h /home/dzinsli/source/freeciv/client/options.h
--- /home/dzinsli/source/freeciv-cvs/client/options.h	Wed Feb  2 20:21:00 2000
+++ /home/dzinsli/source/freeciv/client/options.h	Wed Mar  1 21:30:19 2000
@@ -24,6 +24,7 @@
 extern int draw_diagonal_roads;
 extern int center_when_popup_city;
 extern int concise_city_production;
+extern int auto_turn_done;
 extern int draw_map_grid;
 
 typedef struct {