diff --git a/gui/dialogs/autopilot.xml b/gui/dialogs/autopilot.xml
new file mode 100644
index 000000000..e3b22e3e3
--- /dev/null
+++ b/gui/dialogs/autopilot.xml
@@ -0,0 +1,183 @@
+
+
+
+
+ dialog
+
+ autopilot
+ 500
+ 300
+ false
+
+
+ 10
+ 270
+
+
+
+
+
+
+ 10
+ 230
+
+
+
+
+ 150
+ 230
+
+
+
+
+ 250
+ 230
+
+
+
+
+
+
+ 10
+ 200
+
+
+
+
+ 150
+ 200
+ 75
+ 25
+ /autopilot/locks/heading
+
+
+
+ 250
+ 200
+ 150
+ 25
+ /autopilot/settings/heading-bug-deg
+
+
+
+ 10
+ 170
+
+
+
+
+ 150
+ 170
+ 75
+ 25
+ /autopilot/locks/altitude
+
+
+
+ 250
+ 170
+ 150
+ 25
+ /autopilot/settings/altitude-ft
+
+
+
+ 10
+ 140
+
+
+
+
+ 150
+ 140
+ 75
+ 25
+ /autopilot/locks/nav
+
+
+
+ 10
+ 110
+
+
+
+
+ 150
+ 110
+ 75
+ 25
+ /autopilot/locks/glide-slope
+
+
+
+ 10
+ 80
+
+
+
+
+ 150
+ 80
+ 75
+ 25
+ /autopilot/locks/auto-throttle
+
+
+
+ 10
+ 50
+
+
+
+
+ 150
+ 50
+ 75
+ 25
+ /autopilot/locks/terrain
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gui/menubar.xml b/gui/menubar.xml
index ff7f659b4..2aeb78589 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -139,19 +139,13 @@
-
-
+
- old-ap-altitude-dialog
+ dialog-show
+ autopilot
-
- -
-
-
- old-ap-heading-dialog
-
-
-
+
-
diff --git a/keyboard.xml b/keyboard.xml
index a9c29d74a..2796d374d 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -40,15 +40,6 @@ calculated by adding 256 to the GLUT key value in glut.h.
-
- Ctrl-D
- weather dialog
-
- dialog-show
- winds
-
-
-
Ctrl-G
Toggle autopilot glide slope lock.
@@ -607,6 +598,22 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ C
+ scripting test
+
+ script
+
+
+
+
M
Decrease warp.
@@ -1052,6 +1059,14 @@ calculated by adding 256 to the GLUT key value in glut.h.
F8
+
+ Cycle fog type
+ property-cycle
+ /sim/rendering/fog
+ fastest
+ nicest
+ disabled
+
Scroll panel right
@@ -1073,6 +1088,11 @@ calculated by adding 256 to the GLUT key value in glut.h.
F10
+
+ Toggle menubar
+ property-toggle
+ /sim/menubar/visibility
+
Toggle FDM data logging.
@@ -1082,6 +1102,15 @@ calculated by adding 256 to the GLUT key value in glut.h.
+
+ F11
+
+ Pop up autopilot dialog
+ dialog-show
+ autopilot
+
+
+
Enter
Move rudder right or increase autopilot heading.