diff --git a/data/presets.yaml b/data/presets.yaml
index d536bc5528..22b2b9a12e 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -167,6 +167,22 @@ en:
       barrier:
         # barrier=*
         label: Type
+      bath/open_air:
+        # 'bath:open_air=*'
+        label: Open air bath
+      bath/sand_bath:
+        # 'bath:sand_bath=*'
+        label: Sand bath
+      bath/type:
+        # 'bath:type=*'
+        label: Bath amenity
+        options:
+          # 'bath:type=foot_bath'
+          foot_bath: Foot Bath
+          # 'bath:type=hot_spring'
+          hot_spring: Hot Spring
+          # 'bath:type=onsen'
+          onsen: Onsen
       beauty:
         # beauty=*
         label: Shop Type
@@ -1640,6 +1656,11 @@ en:
         name: Pub
         # 'terms: alcohol,drink,dive,beer,bier,booze'
         terms: '<translate with synonyms or related terms for ''Pub'', separated by commas>'
+      amenity/public_bath:
+        # amenity=public_bath
+        name: Public bath
+        # 'terms: onsen,foot bath,hot springs'
+        terms: '<translate with synonyms or related terms for ''Public bath'', separated by commas>'
       amenity/public_bookcase:
         # amenity=public_bookcase
         name: Public Bookcase
diff --git a/data/presets/fields.json b/data/presets/fields.json
index d7b964d762..e5d131e7c4 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -223,6 +223,28 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "bath/open_air": {
+            "key": "bath:open_air",
+            "label": "Open air bath",
+            "type": "check"
+        },
+        "bath/sand_bath": {
+            "key": "bath:sand_bath",
+            "label": "Sand bath",
+            "type": "check"
+        },
+        "bath/type": {
+            "key": "bath:type",
+            "type": "combo",
+            "label": "Bath amenity",
+            "strings": {
+                "options": {
+                    "onsen": "Onsen",
+                    "foot_bath": "Foot Bath",
+                    "hot_spring": "Hot Spring"
+                }
+            }
+        },
         "beauty": {
             "key": "beauty",
             "type": "combo",
diff --git a/data/presets/fields/bath/open_air.json b/data/presets/fields/bath/open_air.json
new file mode 100644
index 0000000000..fa399ef1ee
--- /dev/null
+++ b/data/presets/fields/bath/open_air.json
@@ -0,0 +1,5 @@
+{
+  "key": "bath:open_air",
+  "label": "Open air bath",
+  "type": "check"
+}
diff --git a/data/presets/fields/bath/sand_bath.json b/data/presets/fields/bath/sand_bath.json
new file mode 100644
index 0000000000..a065baee2f
--- /dev/null
+++ b/data/presets/fields/bath/sand_bath.json
@@ -0,0 +1,5 @@
+{
+  "key": "bath:sand_bath",
+  "label": "Sand bath",
+  "type": "check"
+}
diff --git a/data/presets/fields/bath/type.json b/data/presets/fields/bath/type.json
new file mode 100644
index 0000000000..7bbe3d2cf5
--- /dev/null
+++ b/data/presets/fields/bath/type.json
@@ -0,0 +1,12 @@
+{
+  "key": "bath:type",
+  "type": "combo",
+  "label": "Bath amenity",
+  "strings": {
+    "options": {
+      "onsen": "Onsen",
+      "foot_bath": "Foot Bath",
+      "hot_spring": "Hot Spring"
+    }
+  }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 62a2115dfc..3ee9a6d75c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1872,6 +1872,30 @@
             ],
             "name": "Pub"
         },
+        "amenity/public_bath": {
+            "icon": "water",
+            "fields": [
+                "bath/type",
+                "bath/open_air",
+                "bath/sand_bath",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "public_bath"
+            },
+            "terms": [
+                "onsen",
+                "foot bath",
+                "hot springs"
+            ],
+            "name": "Public bath"
+        },
         "amenity/public_bookcase": {
             "icon": "library",
             "fields": [
diff --git a/data/presets/presets/amenity/public_bath.json b/data/presets/presets/amenity/public_bath.json
new file mode 100644
index 0000000000..000d1cf497
--- /dev/null
+++ b/data/presets/presets/amenity/public_bath.json
@@ -0,0 +1,24 @@
+{
+    "icon": "water",
+    "fields": [
+        "bath/type",
+        "bath/open_air",
+        "bath/sand_bath",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "public_bath"
+    },
+    "terms": [
+        "onsen",
+        "foot bath",
+        "hot springs"
+    ],
+    "name": "Public bath"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index a9c663eb0b..4d3c38595d 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -387,6 +387,10 @@
             "key": "amenity",
             "value": "pub"
         },
+        {
+            "key": "amenity",
+            "value": "public_bath"
+        },
         {
             "key": "amenity",
             "value": "public_bookcase"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 44949de8fa..a00cde3327 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -784,6 +784,20 @@
                 "barrier": {
                     "label": "Type"
                 },
+                "bath/open_air": {
+                    "label": "Open air bath"
+                },
+                "bath/sand_bath": {
+                    "label": "Sand bath"
+                },
+                "bath/type": {
+                    "label": "Bath amenity",
+                    "options": {
+                        "onsen": "Onsen",
+                        "foot_bath": "Foot Bath",
+                        "hot_spring": "Hot Spring"
+                    }
+                },
                 "beauty": {
                     "label": "Shop Type"
                 },
@@ -2060,6 +2074,10 @@
                     "name": "Pub",
                     "terms": "alcohol,drink,dive,beer,bier,booze"
                 },
+                "amenity/public_bath": {
+                    "name": "Public bath",
+                    "terms": "onsen,foot bath,hot springs"
+                },
                 "amenity/public_bookcase": {
                     "name": "Public Bookcase",
                     "terms": "library,bookcrossing"