diff --git a/icons/poi_school.svg b/icons/poi_school.svg
new file mode 100644
index 000000000..8fee2d249
--- /dev/null
+++ b/icons/poi_school.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" xmlns="http://www.w3.org/2000/svg">
+ <g style="display:inline;stroke:#000;stroke-opacity:0">
+  <path style="display:inline;fill:#003f87;fill-opacity:1;stroke:#f9f5f0;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" d="M 11,1 3,4 9,6 Z M 5,9 V 19 H 15 V 9 Z M 9,6 v 3 h 2 V 1 Z"/>
+ </g>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index 7cb977024..67da7cfa6 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -326,6 +326,34 @@
       "object_types": ["area"],
       "description": "Intermittent lakes are translucent with a dashed line representing the lakeshore.",
       "doc_url": "https://openmaptiles.org/schema/#water"
+    },
+    {
+      "key": "amenity",
+      "value": "school",
+      "object_types": ["node", "area"],
+      "description": "Schools are represented by an icon.",
+      "doc_url": "https://openmaptiles.org/schema/#poi"
+    },
+    {
+      "key": "amenity",
+      "value": "kindergarten",
+      "object_types": ["node", "area"],
+      "description": "Schools are represented by an icon.",
+      "doc_url": "https://openmaptiles.org/schema/#poi"
+    },
+    {
+      "key": "amenity",
+      "value": "college",
+      "object_types": ["node", "area"],
+      "description": "Schools are represented by an icon.",
+      "doc_url": "https://openmaptiles.org/schema/#poi"
+    },
+    {
+      "key": "amenity",
+      "value": "university",
+      "object_types": ["node", "area"],
+      "description": "Schools are represented by an icon.",
+      "doc_url": "https://openmaptiles.org/schema/#poi"
     }
   ]
 }
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 9d090a537..8835ad47d 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -7,6 +7,7 @@ var iconDefs = {
   hospital: "hospital",
   medical: ["doctors", "clinic"],
   parking: "parking",
+  school: ["kindergarten", "school", "college", "university"],
 };
 
 export const poi = {
@@ -23,7 +24,7 @@ export const poi = {
       ["get", "subclass"],
       [...iconDefs.bar, ...iconDefs.coffee],
       Color.poi.consumer,
-      ["hospital", "parking"],
+      ["hospital", "parking", "school"],
       Color.poi.infrastructure,
       Color.poi.infrastructure,
     ],
@@ -34,7 +35,7 @@ export const poi = {
     [
       "match",
       ["get", "subclass"],
-      "hospital",
+      ["hospital", ...iconDefs.school],
       15,
       [...iconDefs.bar, ...iconDefs.coffee],
       16,
@@ -66,6 +67,8 @@ export const poi = {
       "poi_hospital",
       iconDefs.parking,
       "poi_p",
+      iconDefs.school,
+      "poi_school",
       "poi_square_dot", //icon for generic POI, not currently used
     ],
     "icon-size": 1.0,
@@ -108,4 +111,9 @@ export const legendEntries = [
     layers: [poi.id],
     filter: ["==", ["get", "subclass"], iconDefs.parking],
   },
+  {
+    description: "School",
+    layers: [poi.id],
+    filter: ["in", ["get", "subclass"], ["literal", iconDefs.school]],
+  },
 ];