diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml
index fdad9b11b..a6b69707a 100644
--- a/Translations/strings-default.xml
+++ b/Translations/strings-default.xml
@@ -92,6 +92,7 @@
  <enable-random-objects-desc>Include random scenery objects</enable-random-objects-desc>
  <disable-real-weather-fetch-desc>Disable METAR based real weather fetching</disable-real-weather-fetch-desc>
  <enable-real-weather-fetch-desc>Enable METAR based real weather fetching (this requires an open internet connection)</enable-real-weather-fetch-desc>
+ <metar-desc>Pass a METAR to set up static weather</metar-desc>
  <random-objects-desc>(buildings, etc.)</random-objects-desc>
  <disable-ai-models-desc>Disable the artificial traffic subsystem.</disable-ai-models-desc>
  <enable-ai-models-desc>Enable the artificial traffic.</enable-ai-models-desc>
diff --git a/options.xml b/options.xml
index 8026fe376..d4978b134 100644
--- a/options.xml
+++ b/options.xml
@@ -764,6 +764,11 @@
   <section>
    <name>strings/environment-options</name>
 
+   <option>
+    <name>metar</name>
+    <description>strings/metar-desc</description>
+   </option>
+
    <option>
     <name>disable-real-weather-fetch</name>
     <description>strings/disable-real-weather-fetch-desc</description>
@@ -818,7 +823,7 @@
 
    <option>
     <name>wind</name>
-    <arg>DIR@SPEED</arg>
+    <arg>DIR[:MAXDIR]@SPEED[:GUST]</arg>
     <description>strings/wind-desc</description>
     <brief/>
    </option>
diff --git a/preferences.xml b/preferences.xml
index 95cf9f9df..3ed2e3ea2 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -605,6 +605,61 @@ Started September 2000 by David Megginson, david@megginson.com
  <!-- Environment -->
 
  <environment>
+  <weather-scenarios>
+    <scenario>
+      <name>Disabled</name>
+      <description>METAR weather generation is disabled. Use 'Weather Conditions' and 'Clouds' dialogs to setup your weather.</description>
+    </scenario>
+    <scenario>
+      <name>Live data</name>
+      <description>Fetch live weather data for your nearest airport from noaa.gov. You need a working internet connection.</description>
+    </scenario>
+    <scenario>
+      <name>Manual input</name>
+      <description>Enter your favorite METAR weather in the textbox below. A valid METAR syntax is required.</description>
+    </scenario>
+    <scenario>
+      <name>Fair weather</name>
+      <metar>XXXX 012345Z 15003KT 12SM SCT041 FEW200 20/08 Q1015 NOSIG</metar>
+      <description>A lovely day for trip to your favorite 100$ hamburger airfield</description>
+    </scenario>
+    <scenario>
+      <name>Thunderstorm</name>
+      <metar>XXXX 012345Z 15012G25KT 4000 TSRA FEW030CB SCT035TCU 27/24 Q0995</metar>
+      <description>A hot and damp summer day with thunderstorms developing in the afternoon.
+                   Be prepared for reduction of visibility in showers and strong gusts
+                   near thunderstorms</description>
+    </scenario>
+    <scenario>
+      <name>Stormy Monday</name>
+      <metar>XXXX 012345Z 28035G50KT 9999 TSRA SCT022CB BKN030 13/09 Q1005</metar>
+      <description>Your are out for an adventure? Gusty winds blowing from the west
+                   and isolated thunderstorms should be avoided. Fasten your seatbelt!</description>
+    </scenario>
+    <scenario>
+      <name>Marginal VFR</name>
+      <metar>XXXX 012345Z 23010KT 5000 SHRA SCT012 BKN018 OVC060 15/11 Q1010</metar>
+      <description>After the storm - limited visibility and some showers. 
+                   Go or No-Go?</description>
+    </scenario>
+    <scenario>
+      <name>CAT I minimum</name>
+      <metar>XXXX 012345Z 15015KT 0800 -RA BKN002 OVC004 08/06 Q0990</metar>
+      <description>If you just got your IFR rating, this is what you are allowed to do. But can you?</description>
+    </scenario>
+    <scenario>
+      <name>CAT II minimum</name>
+      <metar>XXXX 012345Z 15010KT 0400 -RA BKN001 OVC002 08/06 Q0990</metar>
+      <description>With just a 1/4 mile visibility and clouds at 100ft, you don't see much of the runway until
+                   seconds before touchdown. Trust your instruments to stay alive.</description>
+    </scenario>
+    <scenario>
+      <name>CAT IIIb minimum</name>
+      <metar>XXXX 012345Z VRB01KT 0100 FG OVC001 OVC002 02/02 Q0990</metar>
+      <description>This is expert level. You will barely see the taxiway from the cockpit, even if you are
+                   on ground. Fog and light drizzle, freezing level at 1000ft.</description>
+    </scenario>
+  </weather-scenarios>
   <weather-scenario>Fair weather</weather-scenario>
   <config>
 
@@ -621,9 +676,12 @@ Started September 2000 by David Megginson, david@megginson.com
      <temperature-degc>15.0</temperature-degc>
      <dewpoint-degc>5.0</dewpoint-degc>
      <turbulence>
+      <factor>0.2</factor>
       <magnitude-norm>0.0</magnitude-norm>
       <rate-hz>1.0</rate-hz>
      </turbulence>
+     <wind-heading-change-deg>0</wind-heading-change-deg>
+     <wind-speed-change-rel>0</wind-speed-change-rel>
     </entry>
 
     <entry>
@@ -631,9 +689,12 @@ Started September 2000 by David Megginson, david@megginson.com
      <wind-from-heading-deg>280</wind-from-heading-deg>
      <wind-speed-kt>6</wind-speed-kt>
      <turbulence>
+      <factor>1.0</factor>
       <magnitude-norm>0.1</magnitude-norm>
       <rate-hz>1.0</rate-hz>
      </turbulence>
+     <wind-heading-change-deg>5</wind-heading-change-deg>
+     <wind-speed-change-rel>0.3</wind-speed-change-rel>
     </entry>
 
    </boundary>
@@ -649,9 +710,12 @@ Started September 2000 by David Megginson, david@megginson.com
      <!-- <temperature-degc>15.0</temperature-degc> -->
      <!-- <dewpoint-degc>5.0</dewpoint-degc> -->
      <turbulence>
+      <factor>0.5</factor>
       <magnitude-norm>0.05</magnitude-norm>
       <rate-hz>1.0</rate-hz>
      </turbulence>
+     <wind-heading-change-deg>25</wind-heading-change-deg>
+     <wind-speed-change-rel>1</wind-speed-change-rel>
     </entry>
 
     <entry>
@@ -659,15 +723,20 @@ Started September 2000 by David Megginson, david@megginson.com
      <wind-from-heading-deg>310</wind-from-heading-deg>
      <wind-speed-kt>20</wind-speed-kt>
      <turbulence>
+      <factor>0.0</factor>
       <magnitude-norm>0.0</magnitude-norm>
       <rate-hz>1.0</rate-hz>
      </turbulence>
+     <wind-heading-change-deg>30</wind-heading-change-deg>
+     <wind-speed-change-rel>1.2</wind-speed-change-rel>
     </entry>
 
     <entry>
      <elevation-ft>9000</elevation-ft>
      <wind-from-heading-deg>320</wind-from-heading-deg>
      <wind-speed-kt>30</wind-speed-kt>
+     <wind-heading-change-deg>35</wind-heading-change-deg>
+     <wind-speed-change-rel>1.3</wind-speed-change-rel>
     </entry>
 
    </aloft>
@@ -709,6 +778,7 @@ Started September 2000 by David Megginson, david@megginson.com
   <params>
    <real-world-weather-fetch type="bool">false</real-world-weather-fetch>
    <metar-max-age-min type="long">240</metar-max-age-min>
+   <metar-updates-environment type="bool">true</metar-updates-environment>
    <control-fdm-atmosphere type="bool">true</control-fdm-atmosphere>
    <contrail-altitude>30000</contrail-altitude>
   </params>