diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 3016ff5b8..d0e3a836d 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -1265,6 +1265,17 @@ _setlistener("/sim/signals/screenshot", func {
      }
 });
 
+var terrasync_stalled = 0;
+_setlistener("/sim/terrasync/stalled", func {
+     var stalled = getprop("/sim/terrasync/stalled");
+     if (stalled and !terrasync_stalled)
+     {
+         var button = { button: { legend: "Ok", default: 1, binding: { command: "dialog-close" }}};
+         popupTip("Scenery download stalled. Too many errors reported. See log output.", 600, button);
+     }
+     terrasync_stalled = stalled;
+});
+
 var do_welcome = 1;
 _setlistener("/sim/signals/fdm-initialized", func {
     var haveTutorials = size(props.globals.getNode("/sim/tutorials", 1).getChildren("tutorial"));
diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml
index 7bfd520eb..8a444eb75 100644
--- a/Translations/strings-default.xml
+++ b/Translations/strings-default.xml
@@ -250,6 +250,9 @@
  <proxy-desc>Specify which proxy server (and port) to use. The username and password are optional and should be MD5 encoded already. This option is only useful when used in conjunction with the real-weather-fetch option.</proxy-desc>
  <telnet-desc>Enable telnet server on the specified port</telnet-desc>
  <jpg-httpd-desc>Enable screen shot http server on the specified port</jpg-httpd-desc>
+ <disable-terrasync-desc>Disable automatic scenery downloads/updates</disable-terrasync-desc>
+ <enable-terrasync-desc>Enable automatic scenery downloads/updates</enable-terrasync-desc>
+ <terrasync-dir-desc>Set target directory for scenery downloads</terrasync-dir-desc>
 
  <!-- MultiPlayer options -->
  <multiplayer-options>MultiPlayer Options</multiplayer-options>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index af363d4d8..103f8a145 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1752,7 +1752,6 @@
       </textbox>
       <button>
         <legend>Apply</legend>
-        <key>Esc</key>
         <pref-width>50</pref-width>
         <pref-height>50</pref-height>
         <border>2</border>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index b4e84ddbb..fc1fa481f 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -361,6 +361,14 @@
 			</binding>
 		</item>
 
+		<item>
+			<label>Scenery Download</label>
+			<binding>
+				<command>dialog-show</command>
+				<dialog-name>terrasync</dialog-name>
+			</binding>
+		</item>
+
 	</menu>
 
 	<menu>
@@ -595,14 +603,6 @@
 			</binding>
 		</item>
 
-		<item>
-			<label>Reload Scenery</label>
-			<binding>
-				<command>reinit</command>
-				<subsystem>tile-manager</subsystem>
-			</binding>
-		</item>
-
 		<item>
 			<label>Nasal Console</label>
 			<binding>
diff --git a/options.xml b/options.xml
index 4a1ed46c0..8d12e210e 100644
--- a/options.xml
+++ b/options.xml
@@ -978,6 +978,21 @@
     <description>strings/jpg-httpd-desc</description>
    </option>
 
+   <option>
+    <name>disable-terrasync</name>
+    <description>strings/disable-terrasync-desc</description>
+   </option>
+
+   <option>
+    <name>enable-terrasync</name>
+    <description>strings/enable-terrasync-desc</description>
+   </option>
+
+   <option>
+    <name>terrasync-dir</name>
+    <description>strings/terrasync-dir-desc</description>
+   </option>
+
   </section>
 
   <section>
diff --git a/preferences.xml b/preferences.xml
index 62cf00e9b..101082c0b 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -754,9 +754,16 @@ Started September 2000 by David Megginson, david@megginson.com
 			<debug type="bool" archive="y">false</debug>
 		</jetways>
 
+		<terrasync preserve="y">
+			<enabled type="bool" userarchive="y">false</enabled>
+			<use-built-in-svn type="bool" userarchive="y">true</use-built-in-svn>
+			<refresh-display type="bool" userarchive="y">false</refresh-display>
+			<use-svn type="bool" userarchive="y">true</use-svn>
+			<svn-server userarchive="y">http://terrascenery.googlecode.com/svn/trunk/data/Scenery</svn-server>
+			<rsync-server userarchive="y">scenery.flightgear.org::Scenery</rsync-server>
+			<scenery-dir userarchive="y"></scenery-dir>
+		</terrasync>
 	</sim>
-
-
 	<!-- mouse mode -->
 	<devices>
 		<status>