diff --git a/project.mml b/project.mml
index cc4b6d7fd4..60261738de 100644
--- a/project.mml
+++ b/project.mml
@@ -2165,7 +2165,7 @@ Layer:
             CASE WHEN tunnel IN ('yes', 'culvert') THEN 'yes' ELSE 'no' END AS int_tunnel
           FROM planet_osm_line
           WHERE (waterway IN ('river', 'canal', 'stream', 'drain', 'ditch', 'wadi')
-                 OR "natural" = 'strait')
+                 OR "natural" IN ('bay', 'strait'))
             AND (tunnel IS NULL or tunnel != 'culvert')
             AND name IS NOT NULL
           ORDER BY COALESCE(layer,0)
diff --git a/water.mss b/water.mss
index 31d1c38f1c..0f3d8167f1 100644
--- a/water.mss
+++ b/water.mss
@@ -314,6 +314,7 @@
       }
     }
   }
+  [natural = 'bay'][zoom >= 14],
   [natural = 'strait'][zoom >= 14] {
     text-name: "[name]";
     text-size: 10;