diff --git a/Aircraft/ufo/ufo-set.xml b/Aircraft/ufo/ufo-set.xml
index 9f53e0c04..845b5f82b 100644
--- a/Aircraft/ufo/ufo-set.xml
+++ b/Aircraft/ufo/ufo-set.xml
@@ -87,6 +87,10 @@
 				<name>m</name>
 				<desc>toggle marker for active (= last selected) object</desc>
 			</key>
+			<key>
+				<name>n</name>
+				<desc>export flightplan</desc>
+			</key>
 			<key>
 				<name>P</name>
 				<desc>toggle radar panel (see Ctrl-C for the control areas)</desc>
@@ -181,6 +185,15 @@
 				</binding>
 			</key>
 
+			<key n="110">
+				<name>n</name>
+				<desc>Export FlightPlan</desc>
+				<binding>
+					<command>nasal</command>
+					<script>ufo.export_flightplan()</script>
+				</binding>
+			</key>
+
 			<key n="360">
 				<name>PageUp</name>
 				<desc>Increase throttle or autopilot autothrottle.</desc>
@@ -374,6 +387,7 @@
 			<switch type="string" archive="y">on</switch>
 			<range type="double" archive="y">40</range>
 			<mode-control type="int" archive="y">2</mode-control>
+			<limit-deg type="double">180</limit-deg>
 
 			<mode type="string" archive="y">WX</mode>
 			<lightning type="bool" archive="y">true</lightning>
diff --git a/Aircraft/ufo/ufo.nas b/Aircraft/ufo/ufo.nas
index c8c45a934..5371404e1 100644
--- a/Aircraft/ufo/ufo.nas
+++ b/Aircraft/ufo/ufo.nas
@@ -633,6 +633,27 @@ var export_data = func {
 }
 
 
+var export_flightplan = func {
+	var path = getprop("/sim/fg-home") ~ "/ufo-flightplan-export.xml";
+	var args = props.Node.new({ filename : path });
+	var export = args.getNode("data/flightplan", 1);
+	var waypoints = modelmgr.get_data().getChildren("model");
+	forindex (var i; waypoints) {
+		var from = waypoints[i];
+		var to = export.getChild("wpt", i, 1);
+		to.getNode("name", 1).setValue("#" ~ i);
+		to.getNode("lat", 1).setDoubleValue(from.getNode("latitude-deg").getValue());
+		to.getNode("lon", 1).setDoubleValue(from.getNode("longitude-deg").getValue());
+		to.getNode("crossat", 1).setDoubleValue(from.getNode("elevation-ft").getValue());
+		to.getNode("on-ground", 1).setBoolValue(1);
+		to.getNode("ktas", 1).setDoubleValue(100);
+	}
+	export.getChild("wpt", i, 1).getNode("name", 1).setValue("END");
+
+	fgcommand("savexml", args);
+	print("flightplan exported to ", path);
+}
+
 
 var file_selector = nil;