diff --git a/layers/poi/class.sql b/layers/poi/class.sql
index e87e0b0..1395ce1 100644
--- a/layers/poi/class.sql
+++ b/layers/poi/class.sql
@@ -44,7 +44,7 @@ RETURNS TEXT AS $$
         WHEN subclass IN ('supermarket','deli','delicatessen','department_store','greengrocer','marketplace') THEN 'grocery'
         WHEN subclass IN ('books','library') THEN 'library'
         WHEN subclass IN ('university','college') THEN 'college'
-        WHEN subclass IN ('hotel','motel','bed_and_breakfast','guest_house','hostel','chalet','alpine_hut','camp_site') THEN 'lodging'
+        WHEN subclass IN ('hotel','motel','bed_and_breakfast','guest_house','hostel','chalet','alpine_hut','camp_site','dormitory') THEN 'lodging'
         WHEN subclass IN ('chocolate','confectionery') THEN 'ice_cream'
         WHEN subclass IN ('post_box','post_office') THEN 'post'
         WHEN subclass IN ('cafe') THEN 'cafe'
diff --git a/layers/poi/etl_diagram.png b/layers/poi/etl_diagram.png
index a88f860..314855c 100644
Binary files a/layers/poi/etl_diagram.png and b/layers/poi/etl_diagram.png differ
diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 68869ce..d9643e9 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -73,6 +73,10 @@ def_poi_mapping_barrier: &poi_mapping_barrier
   - stile
   - toll_booth
 
+# building values , see http://taginfo.openstreetmap.org/keys/building#values
+def_poi_mapping_building: &poi_mapping_building
+  - dormitory
+
 # highway values , see http://taginfo.openstreetmap.org/keys/highway#values
 def_poi_mapping_highway: &poi_mapping_highway
   - bus_stop
@@ -364,6 +368,7 @@ tables:
       aerialway: *poi_mapping_aerialway
       amenity: *poi_mapping_amenity
       barrier: *poi_mapping_barrier
+      building: *poi_mapping_building
       highway: *poi_mapping_highway
       historic: *poi_mapping_historic
       landuse: *poi_mapping_landuse
@@ -429,6 +434,7 @@ tables:
       aerialway: *poi_mapping_aerialway
       amenity: *poi_mapping_amenity
       barrier: *poi_mapping_barrier
+      building: *poi_mapping_building
       highway: *poi_mapping_highway
       historic: *poi_mapping_historic
       landuse: *poi_mapping_landuse
diff --git a/layers/poi/mapping_diagram.png b/layers/poi/mapping_diagram.png
index a764b5c..3fe9c14 100644
Binary files a/layers/poi/mapping_diagram.png and b/layers/poi/mapping_diagram.png differ
diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml
index b72ea84..bd66285 100644
--- a/layers/poi/poi.yaml
+++ b/layers/poi/poi.yaml
@@ -18,15 +18,21 @@ layer:
       description: |
           Original value of either the
           [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity),
-          [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure),
-          [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
-          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway),
-          [`station`](http://wiki.openstreetmap.org/wiki/Key:station),
-          [`sport`](http://wiki.openstreetmap.org/wiki/Key:sport),
-          [`tourism`](http://wiki.openstreetmap.org/wiki/Key:tourism),
+          [`barrier`](http://wiki.openstreetmap.org/wiki/Key:barrier),
+          [`historic`](http://wiki.openstreetmap.org/wiki/Key:historic),
           [`information`](http://wiki.openstreetmap.org/wiki/Key:information),
-          [`religion`](http://wiki.openstreetmap.org/wiki/Key:religion)
-          or [`shop`](http://wiki.openstreetmap.org/wiki/Key:shop)
+          [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
+          [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure),
+          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway),
+          [`shop`](http://wiki.openstreetmap.org/wiki/Key:shop),
+          [`sport`](http://wiki.openstreetmap.org/wiki/Key:sport),
+          [`station`](http://wiki.openstreetmap.org/wiki/Key:station),
+          [`religion`](http://wiki.openstreetmap.org/wiki/Key:religion),
+          [`tourism`](http://wiki.openstreetmap.org/wiki/Key:tourism),
+          [`aerialway`](http://wiki.openstreetmap.org/wiki/Key:aerialway),
+          [`building`](http://wiki.openstreetmap.org/wiki/Key:building),
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway)
+          or [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway)
           tag.  Use this to do more precise styling.
     rank: |
         The POIs are ranked ascending according to their importance within a grid. The `rank` value shows the