diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml
index 556d78b0..8491d675 100644
--- a/layers/water/mapping.yaml
+++ b/layers/water/mapping.yaml
@@ -107,6 +107,10 @@ tables:
       - dock
       water:
       - river
+      - stream
+      - canal
+      - ditch
+      - drain
       - pond
       - basin
       - wastewater
diff --git a/layers/water/mapping_diagram.png b/layers/water/mapping_diagram.png
index 0b7bf5cc..7a6f2ef3 100644
Binary files a/layers/water/mapping_diagram.png and b/layers/water/mapping_diagram.png differ
diff --git a/layers/water/water.sql b/layers/water/water.sql
index a78c07ae..9e94817c 100644
--- a/layers/water/water.sql
+++ b/layers/water/water.sql
@@ -1,6 +1,7 @@
 CREATE OR REPLACE FUNCTION water_class(waterway text, water text, leisure text) RETURNS text AS
 $$
 SELECT CASE
+           WHEN water IN ('river', 'canal', 'stream', 'ditch', 'drain') THEN 'river'
            %%FIELD_MAPPING: class %%
            ELSE 'lake'
            END;
diff --git a/layers/water/water.yaml b/layers/water/water.yaml
index 7d082c08..8a71bb27 100644
--- a/layers/water/water.yaml
+++ b/layers/water/water.yaml
@@ -25,7 +25,11 @@ layer:
     class:
       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
+          The water-covered areas of flowing water bodies with the [`water=river`](http://wiki.openstreetmap.org/wiki/Tag:water=river), 
+          [`water=canal`](http://wiki.openstreetmap.org/wiki/Tag:water=canal),
+          [`water=stream`](http://wiki.openstreetmap.org/wiki/Tag:water=stream),
+          [`water=ditch`](http://wiki.openstreetmap.org/wiki/Tag:water=ditch), or
+          [`water=drain`](http://wiki.openstreetmap.org/wiki/Tag:water=drain) tags are classified as river.  Wet and dry docks
           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`
@@ -34,7 +38,7 @@ layer:
         dock:
           waterway: 'dock'
         river:
-          water: 'river'
+          water: ['river', 'stream', 'canal', 'ditch', 'drain']
         pond:
           water: ['pond', 'basin', 'wastewater']
         lake:
diff --git a/layers/water_name/mapping_diagram.png b/layers/water_name/mapping_diagram.png
index 2bae1338..7a880ad8 100644
Binary files a/layers/water_name/mapping_diagram.png and b/layers/water_name/mapping_diagram.png differ