diff --git a/data/presets.yaml b/data/presets.yaml
index b367bee15..18a81c9fc 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3613,6 +3613,11 @@ en:
         name: Dance Hall
         # 'terms: ballroom,jive,swing,tango,waltz'
         terms: '<translate with synonyms or related terms for ''Dance Hall'', separated by commas>'
+      leisure/dancing_school:
+        # leisure=dance, dance:teaching=yes
+        name: Dancing School
+        # 'terms: jive,swing,tango,waltz,dance teaching'
+        terms: '<translate with synonyms or related terms for ''Dancing School'', separated by commas>'
       leisure/dog_park:
         # leisure=dog_park
         name: Dog Park
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 57635ddfb..ceb7ffe1b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9408,6 +9408,35 @@
             },
             "name": "Dance Hall"
         },
+        "leisure/dancing_school": {
+            "icon": "school",
+            "fields": [
+                "name",
+                "operator",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "jive",
+                "swing",
+                "tango",
+                "waltz",
+                "dance teaching"
+            ],
+            "tags": {
+                "leisure": "dance"
+                "dance:teaching": "yes"
+            },
+            "reference": {
+                "key": "leisure",
+                "value": "dance"
+            },
+            "name": "Dancing School"
+        },
         "leisure/dog_park": {
             "icon": "dog-park",
             "geometry": [
diff --git a/data/presets/presets/leisure/dancing_school.json b/data/presets/presets/leisure/dancing_school.json
new file mode 100644
index 000000000..a316a26cf
--- /dev/null
+++ b/data/presets/presets/leisure/dancing_school.json
@@ -0,0 +1,29 @@
+{
+    "icon": "school",
+    "fields": [
+        "name",
+        "operator",
+        "address",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "jive",
+        "swing",
+        "tango",
+        "waltz",
+        "dance teaching"
+    ],
+    "tags": {
+        "leisure": "dance",
+        "dance:teaching": "yes"
+    },
+    "reference": {
+        "key": "leisure",
+        "value": "dance"
+    },
+    "name": "Dancing School"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index d206b8f4c..0119433de 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1777,6 +1777,10 @@
             "key": "leisure",
             "value": "dance"
         },
+        {
+            "key": "dance:teaching",
+            "value": "yes"
+        },
         {
             "key": "leisure",
             "value": "dog_park"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index bf48be27f..255166457 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4453,6 +4453,10 @@
                     "name": "Dance Hall",
                     "terms": "ballroom,jive,swing,tango,waltz"
                 },
+                "leisure/dancing_school": {
+                    "name": "Dancing School",
+                    "terms": "jive,swing,tango,waltz,dance teaching"
+                },
                 "leisure/dog_park": {
                     "name": "Dog Park",
                     "terms": ""