--- server/unittools.c.orig	Wed Feb  3 14:24:15 1999
+++ server/unittools.c	Wed Feb  3 14:28:50 1999
@@ -42,7 +42,7 @@
   3) the target location is next to the unit
   4) ground unit can only move to ocean squares if there is a transporter
      with free capacity
-  5) marines are the only units that can attack from a ocean square
+  5) marines are the only units that can attack cities from an ocean square
   6) naval units can only be moved to ocean squares or city squares
   7) if there is no enemy units blocking (zoc)
 **************************************************************************/
@@ -74,9 +74,14 @@
     /* Moving from ocean */
     if(ptile2->terrain==T_OCEAN) {
       /* Can't attack a city from ocean unless marines */
-      if(!unit_flag(punit->type, F_MARINES) && is_enemy_city_tile(x,y,punit->owner)) {
-        notify_player_ex(&game.players[punit->owner], punit->x, punit->y, E_NOEVENT, "Game: Only Marines can attack from sea.");
-	return 0;
+      if (is_enemy_city_tile(x,y,punit->owner)) {
+        if (!unit_flag(punit->type, F_MARINES)) {
+          notify_player_ex(&game.players[punit->owner], punit->x, punit->y,
+	    E_NOEVENT, "Game: Only Marines can attack from sea.");
+	  return 0;
+	}
+      } else {	/* moving from ship to shore (not city) is always allowed */
+        return 1;
       }
     }
   } else if(is_sailing_unit(punit)) {
--- data/helpdata.txt.orig	Wed Feb  3 09:36:07 1999
+++ data/helpdata.txt	Fri Feb  5 16:47:06 1999
@@ -1614,7 +1622,6 @@
 
 The following Freeciv ZOC effects differ from some similar games:
 - Enemy cities with no units in them impose ZOC.
-- Land units moving from boats at sea onto land are subject to ZOC.
 These cases will probably be changed in a future version of Freeciv.
 ---
 %% Terrain help by Greg Wooledge <wooledge@xxxxxxxxxxx>.  First