diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml
index cf5822277..de5aa4c82 100644
--- a/gui/dialogs/autopilot.xml
+++ b/gui/dialogs/autopilot.xml
@@ -4,12 +4,12 @@
 
  <name>autopilot</name>
  <width>500</width>
- <height>300</height>
+ <height>330</height>
  <modal>false</modal>
 
  <text>
   <x>10</x>
-  <y>270</y>
+  <y>300</y>
   <label>AutoPilot Settings</label>
  </text>
 
@@ -17,19 +17,19 @@
 
  <text>
   <x>10</x>
-  <y>230</y>
+  <y>260</y>
   <label>Function</label>
  </text>
 
  <text>
   <x>150</x>
-  <y>230</y>
+  <y>260</y>
   <label>Activated</label>
  </text>
 
  <text>
   <x>250</x>
-  <y>230</y>
+  <y>260</y>
   <label>Setting</label>
  </text>
 
@@ -37,13 +37,13 @@
 
  <text>
   <x>10</x>
-  <y>200</y>
+  <y>230</y>
   <label>Heading</label>
  </text>
 
  <checkbox>
   <x>150</x>
-  <y>200</y>
+  <y>230</y>
   <width>12</width>
   <height>12</height>
   <property>/autopilot/locks/heading</property>
@@ -51,7 +51,7 @@
 
  <input>
   <x>250</x>
-  <y>200</y>
+  <y>230</y>
   <width>150</width>
   <height>25</height>
   <property>/autopilot/settings/heading-bug-deg</property>
@@ -59,13 +59,13 @@
 
  <text>
   <x>10</x>
-  <y>170</y>
+  <y>200</y>
   <label>Altitude</label>
  </text>
 
  <checkbox>
   <x>150</x>
-  <y>170</y>
+  <y>200</y>
   <width>12</width>
   <height>12</height>
   <property>/autopilot/locks/altitude</property>
@@ -73,7 +73,7 @@
 
  <input>
   <x>250</x>
-  <y>170</y>
+  <y>200</y>
   <width>150</width>
   <height>25</height>
   <property>/autopilot/settings/altitude-ft</property>
@@ -81,13 +81,13 @@
 
  <text>
   <x>10</x>
-  <y>140</y>
+  <y>170</y>
   <label>VOR 1</label>
  </text>
 
  <checkbox>
   <x>150</x>
-  <y>140</y>
+  <y>170</y>
   <width>12</width>
   <height>12</height>
   <property>/autopilot/locks/nav</property>
@@ -95,13 +95,13 @@
 
  <text>
   <x>10</x>
-  <y>110</y>
+  <y>140</y>
   <label>Glideslope</label>
  </text>
 
  <checkbox>
   <x>150</x>
-  <y>110</y>
+  <y>140</y>
   <width>12</width>
   <height>12</height>
   <property>/autopilot/locks/glide-slope</property>
@@ -109,22 +109,44 @@
 
  <text>
   <x>10</x>
-  <y>80</y>
+  <y>110</y>
   <label>Autothrottle</label>
  </text>
 
  <checkbox>
   <x>150</x>
-  <y>80</y>
+  <y>110</y>
   <width>12</width>
   <height>12</height>
   <property>/autopilot/locks/auto-throttle</property>
  </checkbox>
 
+ <input>
+  <x>250</x>
+  <y>110</y>
+  <width>150</width>
+  <height>25</height>
+  <property>/autopilot/settings/speed-kt</property>
+ </input>
+
+ <text>
+  <x>10</x>
+  <y>80</y>
+  <label>Terrain Follow</label>
+ </text>
+
+ <checkbox>
+  <x>150</x>
+  <y>80</y>
+  <width>12</width>
+  <height>12</height>
+  <property>/autopilot/locks/terrain</property>
+ </checkbox>
+
  <text>
   <x>10</x>
   <y>50</y>
-  <label>Terrain Follow</label>
+  <label>Vertical Speed</label>
  </text>
 
  <checkbox>
@@ -132,9 +154,17 @@
   <y>50</y>
   <width>12</width>
   <height>12</height>
-  <property>/autopilot/locks/terrain</property>
+  <property>/autopilot/locks/vert-speed</property>
  </checkbox>
 
+ <input>
+  <x>250</x>
+  <y>50</y>
+  <width>150</width>
+  <height>25</height>
+  <property>/autopilot/settings/vertical-speed-fpm</property>
+ </input>
+
 
  <!-- Button Group -->