diff --git a/Environment/environment.xml b/Environment/environment.xml
index c04b70eb5..a48fa2bba 100644
--- a/Environment/environment.xml
+++ b/Environment/environment.xml
@@ -283,6 +283,11 @@
 
   </config>
 
+  <climate>
+    <weather-update type="bool" userarchive="y">false</weather-update>
+    <environment-update type="bool" userarchive="y">false</environment-update>
+  </climate>
+
   <clouds>
     <layer n="0">
       <coverage type="string">clear</coverage>
diff --git a/gui/dialogs/environment-settings.xml b/gui/dialogs/environment-settings.xml
index 5bb373790..e4d41a913 100644
--- a/gui/dialogs/environment-settings.xml
+++ b/gui/dialogs/environment-settings.xml
@@ -88,15 +88,45 @@
     </text>
     
     <group>
-      <layout>hbox</layout>
+      <layout>vbox</layout>
       <halign>left</halign>
       <text>
         <label> </label>
         <halign>left</halign>
       </text>
 
+      <group>
+        <layout>hbox</layout>
+
+        <checkbox>
+          <label> Climate updates weather</label>
+          <name>climate-update</name>
+          <property>/environment/climate/weather-update</property>
+          <live>true</live>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+          <binding>
+            <command>property-toggle</command>
+          </binding>
+        </checkbox>
+
+        <checkbox>
+          <label> Climate updates environment</label>
+          <name>climate-update</name>
+          <property>/environment/climate/environment-update</property>
+          <live>true</live>
+          <binding>
+            <command>dialog-apply</command>
+          </binding>
+          <binding>
+            <command>property-toggle</command>
+          </binding>
+        </checkbox>
+      </group>
+
       <checkbox>
-        <label> Set maximum snow level from METAR</label>
+        <label> Set maximum snow level from weather</label>
         <name>metar-snow</name>
         <property>/environment/params/metar-updates-snow-level</property>
         <binding>