diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 7ae2b9f0f0..0f6894a9ef 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1714,3 +1714,4 @@ leisure|miniature_golf;1598;
amenity|social_facility;1599;
craft;[craft?];;name;int_name;1600;
emergency|emergency_ward_entrance;1601;
+amenity|dojo;1602;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 45a8ca96d4..347c065edc 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -32836,3 +32836,47 @@
vi = Lối vào khu cấp cứu
zh-Hans = 急诊室入口
zh-Hant = 急診病房入口
+
+ [type.amenity.dojo]
+ comment = https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo
+ en = Dojo
+ af = Dojo
+ ar = دوجو
+ az = Dojo
+ be = Додзе
+ bg = Доджо
+ ca = Dojo
+ cs = Dojo
+ da = Dojo
+ de = Dojo
+ el = Dojo
+ es = Dojo
+ et = Dojo
+ eu = Dojoa
+ fa = دوجو
+ fi = Dojo
+ fr = Dojo
+ he = דוג'ו
+ hi = डोजो
+ hu = Dojo
+ id = Dojo
+ it = Dojo
+ ja = 道場
+ ko = 도장
+ lt = Dojo
+ mr = डोजो
+ nb = Dojo
+ nl = Dojo
+ pl = Dojo
+ pt = Dojo
+ ro = Dojo
+ ru = Додзё
+ sk = Dojo
+ sv = Dojo
+ sw = Dojo
+ th = โดโจ
+ tr = Dojo
+ uk = Додзьо
+ vi = võ đường
+ zh-Hans = 道场
+ zh-Hant = 道場
diff --git a/data/styles/default/dark/symbols/martial-arts-m.svg b/data/styles/default/dark/symbols/martial-arts-m.svg
new file mode 100644
index 0000000000..d3fa2c23d0
--- /dev/null
+++ b/data/styles/default/dark/symbols/martial-arts-m.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 1eb86a566a..18bb40d86f 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1000,6 +1000,8 @@ node|z17-[aeroway=gate],
area|z17-[aeroway=gate],
node|z17-[sport],
area|z17-[sport],
+node|z18-[amenity=dojo],
+area|z18-[amenity=dojo],
node|z18-[amenity=vending_machine],
area|z18-[amenity=vending_machine],
node|z18-[amenity=post_box],
@@ -1248,6 +1250,9 @@ node|z17-[leisure=miniature_golf],
area|z17-[leisure=miniature_golf],
{icon-image: golf-m.svg;icon-min-distance: 10;}
+node|z17-[amenity=dojo]
+{icon-image: martial-arts-m.svg;}
+
node|z17-[sport],
area|z17-[sport],
{icon-image: pitch-m.svg; icon-min-distance: 10; }
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 95e3f54b0a..709906a904 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1025,6 +1025,7 @@ sport-soccer # icon z17- (also has captio
=== 1300
amenity-atm # icon z18- (also has caption(optional) z18-)
+amenity-dojo # icon z17- (also has caption(optional) z18-)
isoline-step_50 # pathtext z16- (also has line z14-)
landuse-recreation_ground # caption z15- (also has area z12-)
leisure-recreation_ground # caption z17-
@@ -1935,6 +1936,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -8700
# amenity-atm # caption(optional) z18- (also has icon z18-)
+# amenity-dojo # caption(optional) z18- (also has icon z17-)
# leisure-sports_centre # caption(optional) z17- (also has icon z17-)
# === -8750
diff --git a/data/styles/default/light/symbols/martial-arts-m.svg b/data/styles/default/light/symbols/martial-arts-m.svg
new file mode 100644
index 0000000000..2f2fd64ef9
--- /dev/null
+++ b/data/styles/default/light/symbols/martial-arts-m.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 487ba7edbf..992a5e201e 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1025,6 +1025,7 @@ sport-soccer # icon z17- (also has captio
=== 1300
amenity-atm # icon z18- (also has caption(optional) z18-)
+amenity-dojo # icon z17- (also has caption(optional) z18-)
isoline-step_50 # pathtext z15- (also has line z13-)
landuse-recreation_ground # caption z15- (also has area z12-)
leisure-recreation_ground # caption z17-
@@ -1935,6 +1936,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -8700
# amenity-atm # caption(optional) z18- (also has icon z18-)
+# amenity-dojo # caption(optional) z18- (also has icon z17-)
# leisure-sports_centre # caption(optional) z17- (also has icon z17-)
# === -8750