--- gui-xaw/citydlg.c.old	Thu Jun  1 13:20:23 2000
+++ gui-xaw/citydlg.c	Fri Jul  7 05:19:39 2000
@@ -1101,11 +1101,22 @@
 
   if( unit_list_size(punit_list) )  {
     unit_list_iterate((*punit_list), punit) {
-      if(game.player_idx==punit->owner) {
+      if(activate_sleepers_first && game.player_idx==punit->owner
+	 && punit->activity==ACTIVITY_SENTRY) {
 	request_new_unit_activity(punit, ACTIVITY_IDLE);
 	pmyunit = punit;
       }
     } unit_list_iterate_end;
+
+    if (pmyunit == NULL) {
+      unit_list_iterate((*punit_list), punit) {
+	if(game.player_idx==punit->owner) {
+	  request_new_unit_activity(punit, ACTIVITY_IDLE);
+	  pmyunit = punit;
+	}
+      } unit_list_iterate_end;
+    }
+    
     if (pmyunit)
       set_unit_focus(pmyunit);
   }
--- options.c.old	Mon Jun 26 13:21:31 2000
+++ options.c	Fri Jul  7 05:29:56 2000
@@ -48,6 +48,7 @@
 int center_when_popup_city=1;
 int concise_city_production=0;
 int auto_turn_done=0;
+int activate_sleepers_first=0;
 
 #define GEN_OPTION(name, desc, type) { #name, desc, type, &name, NULL }
 #define GEN_OPTION_TERMINATOR { NULL, NULL, COT_BOOL, NULL, NULL }
@@ -67,6 +68,7 @@
   GEN_OPTION(center_when_popup_city,	N_("Center map when Popup city "), COT_BOOL),
   GEN_OPTION(concise_city_production,	N_("Concise City Production    "), COT_BOOL),
   GEN_OPTION(auto_turn_done, 		N_("End Turn when done moving  "), COT_BOOL),
+  GEN_OPTION(activate_sleepers_first,   N_("Actiate sleepers first    "), COT_BOOL),
   GEN_OPTION_TERMINATOR
 };
 
--- options.h.old	Mon Jun 26 13:21:31 2000
+++ options.h	Fri Jul  7 05:17:28 2000
@@ -29,6 +29,7 @@
 extern int center_when_popup_city;
 extern int concise_city_production;
 extern int auto_turn_done;
+extern int activate_sleepers_first;
 
 enum client_option_type {
   COT_BOOL,