Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml	(revision 7586)
+++ data/defaultpresets.xml	(working copy)
@@ -4064,19 +4033,26 @@
         </item> <!-- Post Office -->
     </group> <!-- Public Buildings -->
     <group name="Education" icon="presets/school.png">
-        <item name="Kindergarten" icon="presets/kindergarten.png" type="node,closedway,relation" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=kindergarten"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=kindergarten"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=kindergarten"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=kindergarten"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=kindergarten"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:amenity=kindergarten"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=kindergarten" />
+        <item name="Childcare" icon="presets/kindergarten.png" type="node,closedway,relation" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/childcare2.0" />
             <space />
-            <key key="amenity" value="kindergarten" />
+            <key key="amenity" value="childcare" />
             <text key="name" text="Name" />
+            <text key="operator" text="Operator" />
+            <combo key="operator:type" text="Operator type" values="public;private;religious" />
+			<text key="age_group" text="Age group (ie: 6-12)" />
+			<space />
+			<check key="nursery" text="Nursery" />
+			<check key="kindergarten" text="Kindergarten" />
+			<check key="after_school" text="After school care" />
+			<check key="orphanage" text="Orphanage" />
+			<space />
+			<text key="childcare:capacity" text="Childcare capacity" />
+			<text key="after_school:capacity" text="After school capacity" />
+			<space />
+			<reference ref="oh" />
             <reference ref="link_contact" />
-        </item> <!-- Kindergarten -->
+        </item> <!-- Childcare -->
         <item name="School" icon="presets/school.png" type="node,closedway,relation" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school"
                   ar.href="http://wiki.openstreetmap.org/wiki/Ar:Tag:amenity=school"