--- lala/freeciv/server/unithand.c	Fri Feb 11 12:52:56 2000
+++ freeciv/server/unithand.c	Wed Feb 16 22:29:05 2000
@@ -957,6 +957,12 @@
     punit->x=dest_x;
     punit->y=dest_y;
 
+    /*set activity to sentry if boarding a ship*/
+    if(is_ground_unit(punit) && map_get_terrain(punit->x, punit->y) == T_OCEAN && ! (pplayer->ai.control))
+      {
+	set_unit_activity(punit, ACTIVITY_SENTRY);
+      }
+
     send_unit_info(0, punit, 1);
     
     unit_list_insert(&map_get_tile(dest_x, dest_y)->units, punit);