diff --git a/data/presets.yaml b/data/presets.yaml
index 0ff7e0038..124a400e9 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -274,6 +274,9 @@ en:
       amenity/cinema: 
         name: Cinema
         terms: "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
+      amenity/college: 
+        name: College
+        terms: ""
       amenity/courthouse: 
         name: Courthouse
         terms: ""
@@ -298,6 +301,9 @@ en:
       amenity/hospital: 
         name: Hospital
         terms: "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
+      amenity/kindergarten: 
+        name: Kindergarten
+        terms: "preschool,nursery,childcare,playgroup"
       amenity/library: 
         name: Library
         terms: ""
@@ -357,7 +363,7 @@ en:
         terms: "village hall,city government,courthouse,municipal building,municipal center"
       amenity/university: 
         name: University
-        terms: ""
+        terms: college
       amenity/waste_basket: 
         name: Waste Basket
         terms: "rubbish bin,litter bin,trash can,garbage can"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 97b2041dc..ff3abd936 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -330,6 +330,22 @@
         },
         "name": "Cinema"
     },
+    "amenity/college": {
+        "icon": "college",
+        "fields": [
+            "operator",
+            "address"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "amenity": "college"
+        },
+        "terms": [],
+        "name": "College"
+    },
     "amenity/courthouse": {
         "fields": [
             "operator",
@@ -471,6 +487,28 @@
         },
         "name": "Hospital"
     },
+    "amenity/kindergarten": {
+        "icon": "school",
+        "fields": [
+            "building_area",
+            "address"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "terms": [
+            "preschool",
+            "nursery",
+            "childcare",
+            "playgroup"
+        ],
+        "tags": {
+            "amenity": "kindergarten"
+        },
+        "name": "Kindergarten"
+    },
     "amenity/library": {
         "icon": "library",
         "fields": [
@@ -961,7 +999,9 @@
         "tags": {
             "amenity": "university"
         },
-        "terms": [],
+        "terms": [
+            "college"
+        ],
         "name": "University"
     },
     "amenity/waste_basket": {
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
new file mode 100644
index 000000000..b834be16d
--- /dev/null
+++ b/data/presets/presets/amenity/college.json
@@ -0,0 +1,16 @@
+{
+    "icon": "college",
+    "fields": [
+        "operator",
+        "address"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "college"
+    },
+    "terms": [],
+    "name": "College"
+}
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
new file mode 100644
index 000000000..db9c16481
--- /dev/null
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -0,0 +1,22 @@
+{
+    "icon": "school",
+    "fields": [
+        "building_area",
+        "address"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "terms": [
+        "preschool",
+        "nursery",
+        "childcare",
+        "playgroup"
+    ],
+    "tags": {
+        "amenity": "kindergarten"
+    },
+    "name": "Kindergarten"
+}
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index 56d098bbb..160429272 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -12,6 +12,6 @@
     "tags": {
         "amenity": "university"
     },
-    "terms": [],
+    "terms": ["college"],
     "name": "University"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 525906cd7..0accd8aab 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -705,6 +705,10 @@
                 "name": "Cinema",
                 "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
             },
+            "amenity/college": {
+                "name": "College",
+                "terms": ""
+            },
             "amenity/courthouse": {
                 "name": "Courthouse",
                 "terms": ""
@@ -737,6 +741,10 @@
                 "name": "Hospital",
                 "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
             },
+            "amenity/kindergarten": {
+                "name": "Kindergarten",
+                "terms": "preschool,nursery,childcare,playgroup"
+            },
             "amenity/library": {
                 "name": "Library",
                 "terms": ""
@@ -815,7 +823,7 @@
             },
             "amenity/university": {
                 "name": "University",
-                "terms": ""
+                "terms": "college"
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",