diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 094486d..dc36ed9 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -25,7 +25,6 @@ def_poi_mapping_amenity: &poi_mapping_amenity
   - dentist
   - doctors
   - drinking_water
-  - embassy
   - fast_food
   - ferry_terminal
   - fire_station
@@ -115,6 +114,10 @@ def_poi_mapping_leisure: &poi_mapping_leisure
   - swimming_pool
   - water_park
 
+# office values , see http://taginfo.openstreetmap.org/keys/office#values
+def_poi_mapping_office: &poi_mapping_office
+  - diplomatic
+
 # railway values , see http://taginfo.openstreetmap.org/keys/railway#values
 def_poi_mapping_railway: &poi_mapping_railway
   - halt
@@ -373,6 +376,7 @@ def_poi_mapping: &poi_mapping
   historic: *poi_mapping_historic
   landuse: *poi_mapping_landuse
   leisure: *poi_mapping_leisure
+  office: *poi_mapping_office
   railway: *poi_mapping_railway
   shop: *poi_mapping_shop
   sport: *poi_mapping_sport
diff --git a/layers/poi/mapping_diagram.png b/layers/poi/mapping_diagram.png
index 682751c..fbd2a8a 100644
Binary files a/layers/poi/mapping_diagram.png and b/layers/poi/mapping_diagram.png differ