diff --git a/layers/poi/class.sql b/layers/poi/class.sql
index bcd9565..dca4532 100644
--- a/layers/poi/class.sql
+++ b/layers/poi/class.sql
@@ -54,7 +54,7 @@ RETURNS TEXT AS $$
         WHEN subclass IN ('bar','nightclub') THEN 'bar'
         WHEN subclass IN ('marina','dock') THEN 'harbor'
         WHEN subclass IN ('car','car_repair','taxi') THEN 'car'
-        WHEN subclass IN ('hospital','nursing_home') THEN 'hospital'
+        WHEN subclass IN ('hospital','nursing_home', 'doctors', 'clinic') THEN 'hospital'
         WHEN subclass IN ('grave_yard','cemetery') THEN 'cemetery'
         WHEN subclass IN ('attraction','viewpoint') THEN 'attraction'
         WHEN subclass IN ('biergarten','pub') THEN 'beer'
diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index a0a03f6..07701b2 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -17,6 +17,7 @@ def_poi_mapping_amenity: &poi_mapping_amenity
   - bus_station
   - cafe
   - cinema
+  - clinic
   - college
   - community_centre
   - courthouse