diff --git a/data/deprecated.json b/data/deprecated.json
index 6e6a5bdef..9a4194077 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -24,6 +24,10 @@
       "old": {"amenity": "car_repair"},
       "replace": {"shop": "car_repair"}
     },
+    {
+      "old": {"amenity": "changing_room"},
+      "replace": {"amenity": "dressing_room"}
+    },
     {
       "old": {"amenity": "citymap_post"},
       "replace": {"tourism": "information"}
diff --git a/data/presets.yaml b/data/presets.yaml
index 10bddc44b..85c08e96e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2669,6 +2669,11 @@ en:
         name: Dojo / Martial Arts Academy
         # 'terms: martial arts,dojang'
         terms: '<translate with synonyms or related terms for ''Dojo / Martial Arts Academy'', separated by commas>'
+      amenity/dressing_room:
+        # amenity=dressing_room
+        name: Changing Room
+        # 'terms: changeroom,dressing room,fitting room,locker room'
+        terms: '<translate with synonyms or related terms for ''Changing Room'', separated by commas>'
       amenity/drinking_water:
         # amenity=drinking_water
         name: Drinking Water
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7d7badd57..7a10c67b1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -104,6 +104,7 @@
     "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
     "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
     "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
+    "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["fee", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"},
     "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "wheelchair"], "moreFields": ["covered", "indoor", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
     "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
     "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
diff --git a/data/presets/presets/amenity/dressing_room.json b/data/presets/presets/amenity/dressing_room.json
new file mode 100644
index 000000000..29ec9a2dd
--- /dev/null
+++ b/data/presets/presets/amenity/dressing_room.json
@@ -0,0 +1,30 @@
+{
+    "icon": "maki-clothing-store",
+    "fields": [
+        "operator",
+        "access_simple",
+        "gender",
+        "wheelchair",
+        "building_area"
+    ],
+    "moreFields": [
+        "fee",
+        "opening_hours",
+        "payment_multi_fee",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "changeroom",
+        "dressing room",
+        "fitting room",
+        "locker room"
+    ],
+    "tags": {
+        "amenity": "dressing_room"
+    },
+    "name": "Changing Room"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 15c810299..b58978fc5 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -106,6 +106,7 @@
     {"key": "amenity", "value": "dive_centre", "description": "🄿 Dive Center", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/scuba_diving.svg"},
     {"key": "amenity", "value": "doctors", "description": "🄿 Doctor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/doctor-15.svg"},
     {"key": "amenity", "value": "dojo", "description": "🄿 Dojo / Martial Arts Academy", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
+    {"key": "amenity", "value": "dressing_room", "description": "🄿 Changing Room", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/clothing-store-15.svg"},
     {"key": "amenity", "value": "drinking_water", "description": "🄿 Drinking Water", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/drinking-water-15.svg"},
     {"key": "amenity", "value": "driving_school", "description": "🄿 Driving School", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/car-15.svg"},
     {"key": "amenity", "value": "events_venue", "description": "🄿 Events Venue", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-users.svg"},
@@ -1788,6 +1789,7 @@
     {"key": "amenity", "value": "artwork", "description": "🄳 ➜ tourism=artwork"},
     {"key": "amenity", "value": "bail_bonds", "description": "🄳 ➜ office=bail_bond_agent"},
     {"key": "amenity", "value": "car_repair", "description": "🄳 ➜ shop=car_repair"},
+    {"key": "amenity", "value": "changing_room", "description": "🄳 ➜ amenity=dressing_room"},
     {"key": "amenity", "value": "citymap_post", "description": "🄳 ➜ tourism=information"},
     {"key": "amenity", "value": "club", "description": "🄳 ➜ club=*"},
     {"key": "amenity", "value": "community_center", "description": "🄳 ➜ amenity=community_centre"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index f281124da..d89b4508f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4772,6 +4772,10 @@
                     "name": "Dojo / Martial Arts Academy",
                     "terms": "martial arts,dojang"
                 },
+                "amenity/dressing_room": {
+                    "name": "Changing Room",
+                    "terms": "changeroom,dressing room,fitting room,locker room"
+                },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
                     "terms": "potable water source,water fountain,drinking fountain,bubbler,water tap"