diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index 01233159..45b78b42 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -104,4 +104,7 @@ tables:
       - dock
       water:
       - river
+      - pond
+      - basin
+      - wastewater
     type: polygon
diff --git a/layers/water/mapping_diagram.png b/layers/water/mapping_diagram.png
index 52e8c444..0b7bf5cc 100644
Binary files a/layers/water/mapping_diagram.png and b/layers/water/mapping_diagram.png differ
diff --git a/layers/water/water.yaml b/layers/water/water.yaml
index 8b76a705..7d082c08 100644
--- a/layers/water/water.yaml
+++ b/layers/water/water.yaml
@@ -26,7 +26,8 @@ layer:
       description: |
           All water polygons from [OpenStreetMapData](http://osmdata.openstreetmap.de/) have the class `ocean`.
           Water bodies with the [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river) tag are classified as river.  Wet and dry docks
-          tagged [`waterway=dock`](http://wiki.openstreetmap.org/wiki/Tag:waterway=dock) are classified as a `dock`. 
+          tagged [`waterway=dock`](http://wiki.openstreetmap.org/wiki/Tag:waterway=dock) are classified as a `dock`.
+          Various minor waterbodies are classified as a `pond`.
           Swimming pools tagged [`leisure=swimming_pool`](https://wiki.openstreetmap.org/wiki/Tag:leisure=swimming_pool) are classified as a `swimming_pool`
           All other water bodies are classified as `lake`.
       values:
@@ -34,6 +35,8 @@ layer:
           waterway: 'dock'
         river:
           water: 'river'
+        pond:
+          water: ['pond', 'basin', 'wastewater']
         lake:
         ocean:
         swimming_pool:
diff --git a/layers/water_name/mapping_diagram.png b/layers/water_name/mapping_diagram.png
index 3bbee61b..8712a48f 100644
Binary files a/layers/water_name/mapping_diagram.png and b/layers/water_name/mapping_diagram.png differ