diff --git a/layers/poi/class.sql b/layers/poi/class.sql
index dca45328..63c67c70 100644
--- a/layers/poi/class.sql
+++ b/layers/poi/class.sql
@@ -63,6 +63,7 @@ RETURNS TEXT AS $$
         WHEN subclass IN ('accessories','antiques','art','artwork','gallery','arts_centre') THEN 'art_gallery'
         WHEN subclass IN ('bag','clothes') THEN 'clothing_store'
         WHEN subclass IN ('swimming_area','swimming') THEN 'swimming'
+        WHEN subclass IN ('castle','ruins') THEN 'castle'
         ELSE subclass
     END;
 $$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index dfbf0394..56db5f09 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -77,6 +77,8 @@ def_poi_mapping_highway: &poi_mapping_highway
 # historic values , see http://taginfo.openstreetmap.org/keys/historic#values
 def_poi_mapping_historic: &poi_mapping_historic
   - monument
+  - castle
+  - ruins
 
 # landuse values , see http://taginfo.openstreetmap.org/keys/landuse#values
 def_poi_mapping_landuse: &poi_mapping_landuse
diff --git a/layers/poi/mapping_diagram.png b/layers/poi/mapping_diagram.png
index 60b9b3f9..56e3f26e 100644
Binary files a/layers/poi/mapping_diagram.png and b/layers/poi/mapping_diagram.png differ