diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 00132fca20..eaf9f5e4f6 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -101,7 +101,7 @@ barrier|hedge;100;
 amenity|pub;101;
 leisure|swimming_pool;[leisure=swimming_pool],[amenity=swimming_pool];;name;int_name;102;
 natural|land;103;
-tourism|hotel;104;
+tourism|hotel;[tourism=hotel],[building=hotel],[hotel=yes];;name;int_name;104;
 landuse|cemetery;105;
 sport|soccer;106;
 boundary|administrative|4;[boundary=administrative][admin_level=4];;name;int_name;107;
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index 489a216ea2..eeb3eb1277 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -11,7 +11,6 @@ bench=yes : amenity=bench
 shelter=yes : amenity=shelter
 toilets=yes : amenity=toilets
 restaurant=yes : amenity=restaurant
-hotel=yes : tourism=hotel
 ford=boat : highway=ford
 ford=intermittent : highway=ford
 ford=seasonal : highway=ford