diff --git a/Effects/cloud.eff b/Effects/cloud.eff
index bb6d3c31e..6afd1e0dd 100644
--- a/Effects/cloud.eff
+++ b/Effects/cloud.eff
@@ -36,8 +36,8 @@
         <write-mask>false</write-mask>
       </depth>
       <render-bin>
-        <bin-number>10</bin-number>
-        <bin-name>DepthSortedBin</bin-name>
+        <bin-number>9</bin-number>
+        <bin-name>CLOUDS_BIN</bin-name>
       </render-bin>
       <texture-unit>
         <unit>0</unit>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 8dae4d4c2..114f1f0ca 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -270,6 +270,15 @@
             <command>dialog-apply</command>
           </binding>
         </checkbox>
+
+        <checkbox>
+          <halign>left</halign>
+          <label>Persistent contrails</label>
+          <property>/sim/rendering/contrail-shader</property>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+        </checkbox>
       </group>
 
       <group>
diff --git a/preferences.xml b/preferences.xml
index 38dc73a39..197406363 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -137,9 +137,11 @@ Started September 2000 by David Megginson, david@megginson.com
    <landmass-shader userarchive="y">0</landmass-shader>
    <water-shader userarchive="y">0</water-shader>
    <urban-shader userarchive="y">0</urban-shader>
+   <contrail-shader userarchive="y">0</contrail-shader>
    <snow-level-m type="double">2000.0</snow-level-m>
    <quality-level type="double" userarchive="y">0.0</quality-level>
-  </rendering>
+  
+</rendering>
   <model-hz type="int">120</model-hz>
   <navdb>
    <localizers>
@@ -783,6 +785,22 @@ Started September 2000 by David Megginson, david@megginson.com
      <wind-speed-change-rel>1.3</wind-speed-change-rel>
     </entry>
 
+     <entry>
+       <elevation-ft>30000</elevation-ft>
+       <wind-from-heading-deg>330</wind-from-heading-deg>
+       <wind-speed-kt>50</wind-speed-kt>
+       <wind-heading-change-deg>35</wind-heading-change-deg>
+       <wind-speed-change-rel>1.3</wind-speed-change-rel>
+     </entry>
+
+     <entry>
+       <elevation-ft>40000</elevation-ft>
+       <wind-from-heading-deg>340</wind-from-heading-deg>
+       <wind-speed-kt>70</wind-speed-kt>
+       <wind-heading-change-deg>35</wind-heading-change-deg>
+       <wind-speed-change-rel>1.3</wind-speed-change-rel>
+     </entry>
+
    </aloft>
 
   </config>
@@ -790,14 +808,14 @@ Started September 2000 by David Megginson, david@megginson.com
   <clouds>
    <status>true</status>
    <layer n="0">
-    <coverage>scattered</coverage>
+    <coverage>clear</coverage>
     <elevation-ft>4000</elevation-ft>
     <thickness-ft>600</thickness-ft>
     <transition-ft>150</transition-ft>
     <span-m>40000</span-m>
    </layer>
    <layer n="1">
-    <coverage>cirrus</coverage>
+    <coverage>clear</coverage>
     <elevation-ft>19500</elevation-ft>
     <thickness-ft>65</thickness-ft>
     <transition-ft>25</transition-ft>