--- a/src/water_cmd.cpp	Wed Feb 07 17:52:21 2007 +0000
+++ b/src/water_cmd.cpp	Wed Feb 07 18:01:26 2007 +0000
@@ -661,8 +661,8 @@
 		{{ 0, -1}, {0, 0}, {1, 0}, { 0, -1}, { 1, -1}}
 	};
 
-	/* Ensure sea-level canals do not flood */
-	if (IsTileType(tile, MP_WATER) && !IsTileOwner(tile, OWNER_WATER)) return;
+	/* Ensure sea-level canals and buoys on canal borders do not flood */
+	if ((IsTileType(tile, MP_WATER) || IsBuoyTile(tile)) && !IsTileOwner(tile, OWNER_WATER)) return;
 
 	if (IS_INT_INSIDE(TileX(tile), 1, MapSizeX() - 3 + 1) &&
 			IS_INT_INSIDE(TileY(tile), 1, MapSizeY() - 3 + 1)) {