diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 065fdeb24..8e60be556 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1753,5 +1753,5 @@ post_office|post_partner;1626;
 amenity|ranger_station;1627;
 leisure|escape_game;1628;
 amenity|luggage_locker;1629;
-building|guardhouse;1630;
+building|guardhouse;[building=guardhouse],[amenity=security_booth],[amenity=checkpoint];;;;1630;
 office|security;1631;