diff --git a/data/presets.yaml b/data/presets.yaml
index 03ce23fac..b1115f5bc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1958,6 +1958,11 @@ en:
         name: Shelter
         # 'terms: lean-to,gazebo,picnic'
         terms: '<translate with synonyms or related terms for ''Shelter'', separated by commas>'
+      amenity/shower:
+        # amenity=shower
+        name: Shower
+        # 'terms: gelato'
+        terms: '<translate with synonyms or related terms for ''Shower'', separated by commas>'
       amenity/social_facility:
         # amenity=social_facility
         name: Social Facility
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 201ce5664..d3f401180 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2565,6 +2565,28 @@
             },
             "name": "Shelter"
         },
+        "amenity/shower": {
+            "icon": "water",
+            "fields": [
+                "operator",
+                "opening_hours",
+                "fee",
+                "supervised",
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [
+                "gelato"
+            ],
+            "tags": {
+                "amenity": "shower"
+            },
+            "name": "Shower"
+        },
         "amenity/social_facility": {
             "icon": "poi-social-facility",
             "fields": [
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
new file mode 100644
index 000000000..1d5fcbe89
--- /dev/null
+++ b/data/presets/presets/amenity/shower.json
@@ -0,0 +1,22 @@
+{
+    "icon": "water",
+    "fields": [
+        "operator",
+        "opening_hours",
+        "fee",
+        "supervised",
+        "building_area"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "rain closet"
+    ],
+    "tags": {
+        "amenity": "shower"
+    },
+    "name": "Shower"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index ed37f6100..b7b3e871f 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -479,6 +479,10 @@
             "key": "amenity",
             "value": "shelter"
         },
+        {
+            "key": "amenity",
+            "value": "shower"
+        },
         {
             "key": "amenity",
             "value": "social_facility"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b81fc30f0..55b85d35f 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2765,6 +2765,10 @@
                     "name": "Shelter",
                     "terms": "lean-to,gazebo,picnic"
                 },
+                "amenity/shower": {
+                    "name": "Shower",
+                    "terms": "gelato"
+                },
                 "amenity/social_facility": {
                     "name": "Social Facility",
                     "terms": ""