diff --git a/data/presets.yaml b/data/presets.yaml
index ceb5a3dba..a2ae35fba 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -507,6 +507,9 @@ en:
       amenity/doctor: 
         name: Doctor
         terms: "<translate with synonyms or related terms for 'Doctor', separated by commas>"
+      amenity/dojo: 
+        name: Martial Arts Training Hall
+        terms: "<translate with synonyms or related terms for 'Martial Arts Training Hall', separated by commas>"
       amenity/drinking_water: 
         name: Drinking Water
         terms: "<translate with synonyms or related terms for 'Drinking Water', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index db8be2222..2fe3c6639 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -763,6 +763,26 @@
             "opening_hours"
         ]
     },
+    "amenity/dojo": {
+        "name": "Martial Arts Training Hall",
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "martial arts",
+            "dojo",
+            "dojang"
+        ],
+        "tags": {
+            "amenity": "dojo"
+        },
+        "icon": "pitch",
+        "fields": [
+            "address",
+            "sport"
+        ]
+    },
     "amenity/drinking_water": {
         "icon": "water",
         "geometry": [
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
new file mode 100644
index 000000000..2577c189e
--- /dev/null
+++ b/data/presets/presets/amenity/dojo.json
@@ -0,0 +1,19 @@
+{
+    "name": "Martial Arts Training Hall",
+    "geometry" : [
+        "point", "area"
+    ],
+    "terms": [
+        "martial arts",
+        "dojo",
+        "dojang"
+    ],
+    "tags": {
+        "amenity": "dojo"
+    },
+    "icon": "pitch",
+    "fields": [
+        "address",
+        "sport"
+    ]
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ae9659154..b07cd5b81 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1117,6 +1117,10 @@
                 "name": "Doctor",
                 "terms": "doctor,doctor's office"
             },
+            "amenity/dojo": {
+                "name": "Martial Arts Training Hall",
+                "terms": "martial arts,dojo,dojang"
+            },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
                 "terms": "water fountain,potable water"