diff --git a/project.mml b/project.mml
index 1f13392..ee4182d 100644
--- a/project.mml
+++ b/project.mml
@@ -221,7 +221,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "      (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'no' as bridge\n      from planet_osm_line\n      where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','intstream','intriver')\n        and (bridge is null or bridge not in ('yes','aqueduct','levee'))\n      order by z_order\n      ) as water_lines",
+        "table": "      (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'no' as bridge\n      from planet_osm_line\n      where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','pipeline','intstream','intriver')\n        and (bridge is null or bridge not in ('yes','aqueduct','levee'))\n      order by z_order\n      ) as water_lines",
         "extent": "-20037508,-20037508,20037508,20037508",
         "key_field": "",
         "geometry_field": "way",
@@ -873,7 +873,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "(select way,waterway,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'yes' as bridge from planet_osm_line where waterway in ('river','canal','derelict_canal','stream','drain','ditch','intstream','intriver') and bridge in ('yes','aqueduct','levee') order by z_order) as waterway_bridges",
+        "table": "(select way,waterway,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel, 'yes' as bridge from planet_osm_line where waterway in ('river','canal','derelict_canal','stream','drain','ditch','pipeline','intstream','intriver') and bridge in ('yes','aqueduct','levee') order by z_order) as waterway_bridges",
         "extent": "-20037508,-20037508,20037508,20037508",
         "key_field": "",
         "geometry_field": "way",
@@ -1680,7 +1680,7 @@
       ],
       "Datasource": {
         "type": "postgis",
-        "table": "      (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel\n      from planet_osm_line\n      where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','intstream','intriver')\n       order by z_order\n      ) as water_lines_text",
+        "table": "      (select way,waterway,lock,name,case when tunnel in ('yes','culvert') then 'yes' else 'no' end as int_tunnel\n      from planet_osm_line\n      where waterway in ('weir','river','canal','derelict_canal','stream','drain','ditch','pipeline','intstream','intriver')\n       order by z_order\n      ) as water_lines_text",
         "extent": "-20037508,-20037508,20037508,20037508",
         "key_field": "",
         "geometry_field": "way",
diff --git a/water.mss b/water.mss
index c6f2f55..41b05a5 100644
--- a/water.mss
+++ b/water.mss
@@ -502,6 +502,18 @@
       line-dasharray: 32,64;
     }
   }
+  [waterway = 'pipeline'][zoom >= 15] {
+    line-color: #9900cc;
+    line-width: 0.3;
+    [bridge = 'yes'] {
+      bridgecasing/line-color: black;
+      bridgecasing/line-join: round;
+      bridgecasing/line-width: 3;
+      bridgeglow/line-color: white;
+      bridgeglow/line-join: round;
+      bridgeglow/line-width: 2;
+    }
+  }
 }
 
 #water-lines-text {
@@ -586,6 +598,16 @@
     [zoom >= 20] { text-size: 18; }
   }
 
+  [waterway = 'pipeline'][zoom >= 15] {
+    text-name: "[name]";
+    text-size: 10;
+    text-fill: #9900cc;
+    text-face-name: @oblique-fonts;
+    text-placement: line;
+    text-spacing: 600;
+    text-halo-radius: 1;
+  }
+
   [waterway = 'weir'][zoom >= 15] {
     text-name: "[name]";
     text-size: 10;