diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json
new file mode 100644
index 000000000..dd6c21034
--- /dev/null
+++ b/data/presets/presets/amenity/childcare.json
@@ -0,0 +1,21 @@
+{
+    "icon": "school",
+    "fields": [
+        "building_area",
+        "address"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "nursery",
+        "orphanage",
+        "playgroup"
+    ],
+    "tags": {
+        "amenity": "childcare"
+    },
+    "name": "Childcare"
+}
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index db9c16481..f4a794333 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -10,10 +10,8 @@
         "area"
     ],
     "terms": [
-        "preschool",
         "nursery",
-        "childcare",
-        "playgroup"
+        "preschool"
     ],
     "tags": {
         "amenity": "kindergarten"