diff --git a/openstreetmap-carto.lua b/openstreetmap-carto.lua
index bf472773b4..f0adf194cf 100644
--- a/openstreetmap-carto.lua
+++ b/openstreetmap-carto.lua
@@ -704,7 +704,7 @@ function osm2pgsql.process_relation(object)
     if clean_tags(object.tags) then
         return
     end
-    if type == "boundary" or (type == "multipolygon" and object.tags["boundary"]) then
+    if (type == "boundary" or (type == "multipolygon" and object.tags["boundary"])) and object.tags.boundary == 'administrative' then
         add_line(object.tags)
 
         if roads(object.tags) then
@@ -713,6 +713,9 @@ function osm2pgsql.process_relation(object)
 
         add_polygon(object.tags)
 
+    elseif type == "boundary" then
+        add_polygon(object.tags)
+        
     elseif type == "multipolygon" then
         add_polygon(object.tags)