diff --git a/project.mml b/project.mml
index 76fc7730c5..252d2fab48 100644
--- a/project.mml
+++ b/project.mml
@@ -1066,7 +1066,7 @@ Layer:
               ) as width,
               NULLIF(scale_factor(way)*!scale_denominator!*0.001*0.28, 0) AS sf
             FROM planet_osm_line
-            WHERE aeroway IN ('runway', 'taxiway')
+            WHERE aeroway IN ('runway', 'taxiway', 'stopway')
             ORDER BY bridge NULLS FIRST,
               CASE WHEN aeroway = 'runway' THEN 1 ELSE 0 END
             ) _
diff --git a/style/roads.mss b/style/roads.mss
index f3975a8d78..bbf6ad09a4 100644
--- a/style/roads.mss
+++ b/style/roads.mss
@@ -19,6 +19,7 @@
 @track-fill-noaccess: #e2c5bb;
 @aeroway-fill: #bbc;
 @runway-fill: @aeroway-fill;
+@stopway-fill: lighten(@aeroway-fill, 5%);
 @taxiway-fill: @aeroway-fill;
 @helipad-fill: @aeroway-fill;
 @access-marking: #eaeaea;
@@ -3002,6 +3003,13 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
       }
     }
   }
+  [aeroway = 'stopway'] {
+      ::fill {
+        line-color: @stopway-fill;
+        /* Same as aeroway=runway. */
+        line-width: [area_width];
+      }
+  }
   [aeroway = 'taxiway'] {
     [zoom >= 11] {
       ::casing[bridge = true][zoom >= 14] {