diff --git a/Effects/ws30water.eff b/Effects/ws30water.eff
index 0f5a8bc57..46d767b24 100644
--- a/Effects/ws30water.eff
+++ b/Effects/ws30water.eff
@@ -994,9 +994,9 @@
         </internal-format>
       </texture-unit>
       <program>
-        <vertex-shader>Shaders/water.vert</vertex-shader>
+        <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
         <fragment-shader>Shaders/include_fog.frag</fragment-shader>
-        <fragment-shader>Shaders/water_sine.frag</fragment-shader>
+        <fragment-shader>Shaders/water-ALS-high.frag</fragment-shader>
       </program>
       <uniform>
         <name>water_reflection</name>
@@ -1384,16 +1384,16 @@
           <use>texture[6]/wrap-s</use>
         </wrap-s>
         <wrap-t>
-          <use>texture[6]/wrap-t</use>
+        <use>texture[6]/wrap-t</use>
         </wrap-t>
         <internal-format>
           <use>texture[6]/internal-format</use>
         </internal-format>
       </texture-unit>
       <program>
-        <vertex-shader>Shaders/water.vert</vertex-shader>
+        <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
         <fragment-shader>Shaders/include_fog.frag</fragment-shader>
-        <fragment-shader>Shaders/water.frag</fragment-shader>
+        <fragment-shader>Shaders/water-ALS-base.frag</fragment-shader>
       </program>
       <uniform>
         <name>water_reflection</name>
diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index edda8210c..58cbc3759 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -42,6 +42,32 @@
   <effect>Effects/ws30water</effect>
 </material>
 
+<material n="3002">
+  <name>ws30coastline</name>
+  <effect>Effects/ws30water</effect>
+  <texture>Terrain/coastline.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <diffuse>
+   <r>0.93</r>
+   <g>0.95</g>
+   <b>0.93</b>
+   <a>1.0</a>
+  </diffuse>
+  <specular>
+   <r>0.1</r>
+   <g>0.12</g>
+   <b>0.1</b>
+   <a>1.0</a>
+  </specular>
+  <shininess>1.2</shininess>
+  <solid>1</solid>
+  <friction-factor>0.7</friction-factor>
+  <rolling-friction>0.1</rolling-friction>
+  <bumpiness>0.15</bumpiness>
+  <load-resistance>1e30</load-resistance>
+</material>
+
 
 <!-- Signage -->
 
diff --git a/Textures/Terrain/coastline.png b/Textures/Terrain/coastline.png
new file mode 100644
index 000000000..a708ca4a1
Binary files /dev/null and b/Textures/Terrain/coastline.png differ
diff --git a/defaults.xml b/defaults.xml
index c86a449db..1c0fee910 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -119,6 +119,8 @@ Started September 2000 by David Megginson, david@megginson.com
         <line-features-lod-level type="int" userarchive="y">5</line-features-lod-level>
         <area-features-lod-level type="int" userarchive="y">5</area-features-lod-level>
         <vegetation-lod-level type="int" userarchive="y">6</vegetation-lod-level>
+        <coastline-lod-level type="int" userarchive="y">3</coastline-lod-level>
+        <coastline-width type="float" userarchive="y">80.0</coastline-width>
         <lod-level n="0">
           <area-features-min-width>10000</area-features-min-width>
           <line-features-min-width>9999.9</line-features-min-width>
diff --git a/gui/dialogs/static-lod.xml b/gui/dialogs/static-lod.xml
index fc05ed26d..35e2f19d4 100644
--- a/gui/dialogs/static-lod.xml
+++ b/gui/dialogs/static-lod.xml
@@ -825,6 +825,52 @@
                 <live>true</live>
                 <property>/sim/rendering/static-lod/area-features-lod-level</property>
             </text>        
+
+            <text>
+                <row>4</row>
+                <col>0</col>
+                <enable>
+                    <equals>
+                        <property>/scenery/use-vpb</property>
+                        <value>true</value>
+                    </equals>
+                </enable>
+                <label>Detailed coastline minimum LOD</label>
+            </text>
+            <slider>
+                <row>4</row>
+                <col>1</col>
+                <name>coast-lod</name>
+                <enable>
+                    <equals>
+                        <property>/scenery/use-vpb</property>
+                        <value>true</value>
+                    </equals>
+                </enable>
+                <min>0.0</min>
+                <max>6.0</max>
+                <step>1.0</step>
+                <fraction>0.17</fraction>
+                <property>/sim/rendering/static-lod/coastline-lod-level</property>
+                <binding>
+                    <command>dialog-apply</command>
+                    <object-name>coast-lod</object-name>
+                </binding>
+            </slider>
+            <text>
+                <row>4</row>
+                <col>2</col>
+                <label>1</label>
+                <enable>
+                    <equals>
+                        <property>/scenery/use-vpb</property>
+                        <value>true</value>
+                    </equals>
+                </enable>
+                <format>%d</format>
+                <live>true</live>
+                <property>/sim/rendering/static-lod/coastline-lod-level</property>
+            </text>            
         </group>
     </group>