diff --git a/data/deprecated.json b/data/deprecated.json
index 364ca6e55..67f71a4f3 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -90,7 +90,7 @@
     },
     {
       "old": {"amenity": "preschool"},
-      "replace": {"amenity": "kindergarten"}
+      "replace": {"amenity": "kindergarten", "preschool": "yes"}
     },
     {
       "old": {"amenity": "public_building"},
diff --git a/data/presets.yaml b/data/presets.yaml
index bd0da7c0a..701764ed9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1516,6 +1516,9 @@ en:
       power_supply:
         # power_supply=*
         label: Power Supply
+      preschool:
+        # preschool=*
+        label: Preschool
       produce:
         # produce=*
         label: Produce
diff --git a/data/presets/fields.json b/data/presets/fields.json
index bdece7ea0..e09739782 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -271,6 +271,7 @@
     "population": {"key": "population", "type": "text", "label": "Population"},
     "power_supply": {"key": "power_supply", "type": "check", "label": "Power Supply"},
     "power": {"key": "power", "type": "typeCombo", "label": "Type"},
+    "preschool": {"key": "preschool", "type": "check", "label": "Preschool"},
     "produce": {"key": "produce", "type": "semiCombo", "label": "Produce"},
     "product": {"key": "product", "type": "semiCombo", "label": "Products"},
     "railway": {"key": "railway", "type": "typeCombo", "label": "Type"},
diff --git a/data/presets/fields/preschool.json b/data/presets/fields/preschool.json
new file mode 100644
index 000000000..e2ff613a4
--- /dev/null
+++ b/data/presets/fields/preschool.json
@@ -0,0 +1,5 @@
+{
+    "key": "preschool",
+    "type": "check",
+    "label": "Preschool"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2e45c207c..d2f93027d 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -128,7 +128,7 @@
     "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
     "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
     "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index 4eb52d8d0..9daaa426d 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -3,15 +3,16 @@
     "fields": [
         "name",
         "operator",
-        "address"
+        "address",
+        "phone",
+        "preschool"
     ],
     "moreFields": [
+        "email",
+        "fax",
         "opening_hours",
         "payment_multi",
         "website",
-        "phone",
-        "email",
-        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/taginfo.json b/data/taginfo.json
index 28641e7ae..a00320ae6 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1560,6 +1560,7 @@
     {"key": "min_age", "description": "🄵 Minimum Age"},
     {"key": "population", "description": "🄵 Population"},
     {"key": "power_supply", "description": "🄵 Power Supply"},
+    {"key": "preschool", "description": "🄵 Preschool"},
     {"key": "produce", "description": "🄵 Produce"},
     {"key": "product", "description": "🄵 Products"},
     {"key": "railway:position", "description": "🄵 Milestone Position"},
@@ -1801,7 +1802,7 @@
     {"key": "amenity", "value": "hotel", "description": "🄳 ➜ tourism=hotel"},
     {"key": "amenity", "value": "kiosk", "description": "🄳 ➜ shop=kiosk"},
     {"key": "amenity", "value": "nursery", "description": "🄳 ➜ amenity=kindergarten"},
-    {"key": "amenity", "value": "preschool", "description": "🄳 ➜ amenity=kindergarten"},
+    {"key": "amenity", "value": "preschool", "description": "🄳 ➜ amenity=kindergarten + preschool=yes"},
     {"key": "amenity", "value": "public_building", "description": "🄳 ➜ building=public"},
     {"key": "amenity", "value": "real_estate", "description": "🄳 ➜ office=estate_agent"},
     {"key": "amenity", "value": "sauna", "description": "🄳 ➜ leisure=sauna"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 9d505660e..d048b5d71 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3685,6 +3685,9 @@
                 "power": {
                     "label": "Type"
                 },
+                "preschool": {
+                    "label": "Preschool"
+                },
                 "produce": {
                     "label": "Produce"
                 },