diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index ef68a3094..726b69297 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -393,7 +393,7 @@ power|generator|gas;[power=generator][generator:source=gas];;name;int_name;285;
 sport|athletics;286;
 landuse|railway;287;
 leisure|slipway;288;
-tourism|caravan_site;289;
+tourism|caravan_site;[tourism=caravan_site],[tourism=camp_site][caravans=yes],[tourism=camp_site][motorhome=yes];;name;int_name;289;
 place|state;290;
 power|generator|hydro;[power=generator][generator:source=hydro];;name;int_name;291;
 railway|subway|tunnel;[railway=subway][tunnel?];;name;int_name;292;
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 982210295..2191e45d2 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2973,6 +2973,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
       {{"tourism", "artwork", "sculpture"}, {{"tourism", "artwork"}, {"type", "sculpture"}}},
       {{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"artwork_type", "statue"}}},
       {{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"type", "statue"}}},
+      {{"tourism", "caravan_site"}, {{"tourism", "camp_site"}, {"caravans", "yes"}}},
+      {{"tourism", "caravan_site"}, {{"tourism", "camp_site"}, {"motorhome", "yes"}}},
       {{"attraction", "animal"}, {{"attraction", "animal"}}},
       {{"tourism", "information", "board"}, {{"tourism", "information"}, {"information", "board"}}},
       {{"tourism", "information", "guidepost"}, {{"tourism", "information"}, {"information", "guidepost"}}},