diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 8fe8392ef2..215efb4897 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1074,8 +1074,8 @@ amenity|courthouse;1073;
 amenity|vending_machine|cigarettes;[amenity=vending_machine][vending=cigarettes];;name;int_name;1074;
 amenity|vending_machine|drinks;[amenity=vending_machine][vending=drinks];;name;int_name;1075;
 amenity|waste_basket;1076;
-building|garage;[building=garage],[building=yes][garage];;addr:housenumber;name;1077;
-building|garages;1078;building|garage
+building|garage;[building=garage],[building=yes][garage],[building=garages],[amenity=garage],[amenity=garages];;addr:housenumber;name;1077;
+deprecated|deprecated;1078;x
 emergency|phone;1079;
 highway|rest_area;1080;
 highway|traffic_signals;1081;
diff --git a/data/replaced_tags.txt b/data/replaced_tags.txt
index dc04ca704a..18c8e5fa36 100644
--- a/data/replaced_tags.txt
+++ b/data/replaced_tags.txt
@@ -55,9 +55,6 @@ diet=vegan : cuisine=vegan
 aerodrome:type=international : aerodrome=international
 
 amenity=parking_entrance : amenity=parking
-amenity=garages : building=garage
-amenity=garage : building=garage
-building=garages : building=garage
 
 historic=cannon : historic=memorial
 historic=technical_monument : historic=memorial