diff --git a/scripts/geodata/osm/osm_admin_boundaries.py b/scripts/geodata/osm/osm_admin_boundaries.py
index e9b6f883..b11afe08 100644
--- a/scripts/geodata/osm/osm_admin_boundaries.py
+++ b/scripts/geodata/osm/osm_admin_boundaries.py
@@ -241,9 +241,14 @@ class OSMPolygonReader(object):
 
 class OSMAdminPolygonReader(OSMPolygonReader):
     def include_closed_way(self, props):
-        return False
+        return 'boundary' in props or 'place' in props
 
 
-class OSMZonePolygonReader(OSMPolygonReader):
+class OSMSubdivisionPolygonReader(OSMPolygonReader):
     def include_closed_way(self, props):
-        return 'landuse' in props
+        return 'landuse' in props or 'place' in props
+
+
+class OSMBuildingPolygonReader(OSMPolygonReader):
+    def include_closed_way(self, props):
+        return 'building' in props