diff --git a/layers/boundary/boundary.sql b/layers/boundary/boundary.sql
index f3c1f62..3fb0d68 100644
--- a/layers/boundary/boundary.sql
+++ b/layers/boundary/boundary.sql
@@ -3,7 +3,10 @@
 -- etldoc: ne_110m_admin_0_boundary_lines_land  -> boundary_z0
 
 CREATE OR REPLACE VIEW boundary_z0 AS (
-    SELECT geometry, 2 AS admin_level, false AS disputed, false AS maritime
+    SELECT geometry,
+        2 AS admin_level,
+        (CASE WHEN featurecla LIKE 'Disputed%' THEN true ELSE false END) AS disputed,
+        false AS maritime
     FROM ne_110m_admin_0_boundary_lines_land
 );
 
@@ -11,7 +14,10 @@ CREATE OR REPLACE VIEW boundary_z0 AS (
 -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z1
 
 CREATE OR REPLACE VIEW boundary_z1 AS (
-    SELECT geometry, 2 AS admin_level, false AS disputed, false AS maritime
+    SELECT geometry,
+        2 AS admin_level,
+        (CASE WHEN featurecla LIKE 'Disputed%' THEN true ELSE false END) AS disputed,
+        false AS maritime
     FROM ne_50m_admin_0_boundary_lines_land
     UNION ALL
     SELECT geometry, 4 AS admin_level, false AS disputed, false AS maritime
@@ -23,7 +29,10 @@ CREATE OR REPLACE VIEW boundary_z1 AS (
 -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z3
 
 CREATE OR REPLACE VIEW boundary_z3 AS (
-    SELECT geometry, 2 AS admin_level, false AS disputed, false AS maritime
+    SELECT geometry,
+        2 AS admin_level,
+        (CASE WHEN featurecla LIKE 'Disputed%' THEN true ELSE false END) AS disputed,
+        false AS maritime
     FROM ne_50m_admin_0_boundary_lines_land
     UNION ALL
     SELECT geometry, 4 AS admin_level, false AS disputed, false AS maritime
@@ -36,7 +45,10 @@ CREATE OR REPLACE VIEW boundary_z3 AS (
 -- etldoc: osm_border_linestring_gen10 -> boundary_z4
 
 CREATE OR REPLACE VIEW boundary_z4 AS (
-    SELECT geometry, 2 AS admin_level, false AS disputed, false AS maritime
+    SELECT geometry,
+        2 AS admin_level,
+        (CASE WHEN featurecla LIKE 'Disputed%' THEN true ELSE false END) AS disputed,
+        false AS maritime
     FROM ne_10m_admin_0_boundary_lines_land
     WHERE featurecla <> 'Lease limit'
     UNION ALL