diff --git a/qgcimages.qrc b/qgcimages.qrc
index a363127a36804499f916282ea9a5fb7ce12e6eb1..75fbb02ee30de6ed5aef11a8d327343e8a075e99 100644
--- a/qgcimages.qrc
+++ b/qgcimages.qrc
@@ -3,6 +3,7 @@
         <file alias="adsbVehicle.svg">src/FlightMap/Images/adsbVehicle.svg</file>
         <file alias="Airframe/AirframeSimulation">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
         <file alias="Airframe/AirframeUnknown">src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
+        <file alias="Airframe/Autogyro">src/AutoPilotPlugins/Common/Images/Autogyro.svg</file>
         <file alias="Airframe/Boat">src/AutoPilotPlugins/Common/Images/Boat.svg</file>
         <file alias="Airframe/FlyingWing">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
         <file alias="Airframe/Helicopter">src/AutoPilotPlugins/Common/Images/Helicopter.svg</file>
diff --git a/src/AutoPilotPlugins/Common/Images/Autogyro.svg b/src/AutoPilotPlugins/Common/Images/Autogyro.svg
new file mode 100644
index 0000000000000000000000000000000000000000..57b5eeb73cf70d809e758d81b4417cfd3c8b5c1f
--- /dev/null
+++ b/src/AutoPilotPlugins/Common/Images/Autogyro.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="draw"
+   x="0px"
+   y="0px"
+   viewBox="0 0 161.99399 305.80785"
+   enable-background="new 0 0 387.573 271.669"
+   xml:space="preserve"
+   sodipodi:docname="Autogyro.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   width="161.99399"
+   height="305.80786"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title>Plane</dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs17" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1280"
+   inkscape:window-height="969"
+   id="namedview15"
+   showgrid="false"
+   inkscape:zoom="1.7374083"
+   inkscape:cx="38.129437"
+   inkscape:cy="141.29901"
+   inkscape:window-x="1080"
+   inkscape:window-y="868"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="draw"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+<title
+   id="title2">Plane</title>
+
+
+
+
+
+<g
+   id="g293"
+   transform="translate(-112.7895,34.65236)" /><path
+   id="path11108"
+   style="fill:#4ec3e8;stroke:#000000;stroke-linecap:round;stroke-linejoin:round"
+   d="m 50.274338,279.30496 c 0,0 -15.66603,0.669 -28.33203,26 l 59.05469,0.002 h 59.054682 c -12.667,-25.332 -28.33203,-26 -28.33203,-26 l -21.255852,-0.002 v -60.55469 c 0,-16.083 1.69956,-16.81682 2.97656,-19.04882 0.843,-1.477 27.941412,-30.73829 27.941412,-30.73829 V 59.750272 c 0,-47.25 -40.384772,-47.25781 -40.384772,-47.25781 0,0 -40.38476,0.0078 -40.38476,47.25781 V 168.96316 c 0,0 27.09845,29.26229 27.93945,30.73829 1.274,2.232 2.97852,2.96582 2.97852,19.04882 v 60.55469 z"
+   inkscape:connector-curvature="0"
+   sodipodi:nodetypes="ccccccsccscsccscc" /><g
+   style="opacity:0.8"
+   id="g9800"
+   transform="translate(0.00167,1.433431)"><ellipse
+     style="fill:#159e1f"
+     transform="matrix(0.7091,-0.7051,0.7051,0.7091,-69.5206,95.5208)"
+     cx="80.998001"
+     cy="132.00999"
+     rx="80.988998"
+     ry="81.005997"
+     id="ellipse9798" /></g><path
+   style="fill:#ffffff;stroke:#000000;stroke-miterlimit:10"
+   inkscape:connector-curvature="0"
+   stroke-miterlimit="10"
+   d="m 88.94267,124.54943 c -4.374,-4.384 -11.473,-4.393 -15.858,-0.02 -4.384,4.374 -4.393,11.473 -0.02,15.857 4.365,4.376 11.447,4.395 15.835,0.042 4.396,-4.335 4.446,-11.414 0.111,-15.811 -0.022,-0.022 -0.045,-0.045 -0.068,-0.068 z"
+   id="path9802" /><g
+   id="g973"
+   transform="translate(-112.789,34.13875)"><polygon
+     id="polygon10"
+     points="154.731,258.153 232.841,258.153 232.841,271.153 154.731,271.169 "
+     stroke-miterlimit="10"
+     style="fill:#159e1f;stroke:#000000;stroke-miterlimit:10" /><polygon
+     id="polygon12"
+     points="191.395,270.987 189.395,245.32 198.228,245.32 196.228,270.987 "
+     stroke-miterlimit="10"
+     style="fill:#159e1f;stroke:#000000;stroke-miterlimit:10" /></g><ellipse
+   style="opacity:0.8;fill:#4ec3e8;stroke-width:1.18758416"
+   enable-background="new    "
+   cx="80.996994"
+   cy="6.0689998"
+   rx="35.607258"
+   ry="6.0689998"
+   id="ellipse69" /><path
+   style="opacity:1;fill:#4ec3e8;fill-opacity:1;stroke:none;stroke-width:0.11511399;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   d=""
+   id="path969"
+   inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
index caa3f6235c8a4451ac02e56de6ecbeb0db6a63b1..1f735762a23c7f764a7840f3b34ecfb62025fcec 100644
--- a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
+++ b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
@@ -2,6 +2,23 @@
   <version>1</version>
   <airframe_version_major>1</airframe_version_major>
   <airframe_version_minor>1</airframe_version_minor>
+  <airframe_group image="Autogyro" name="Autogyro">
+    <airframe id="17002" maintainer="ThunderFly s.r.o., Roman Dvorak &lt;dvorakroman@thunderfly.cz&gt;" name="TF:AutoG2">
+      <class>Autogyro</class>
+      <maintainer>ThunderFly s.r.o., Roman Dvorak &lt;dvorakroman@thunderfly.cz&gt;</maintainer>
+      <type>Autogyro</type>
+      <url>https://github.com/ThunderFly-aerospace/Auto-G2/</url>
+      <output name="MAIN1">rotor_head_L</output>
+      <output name="MAIN2">rotor_head_R</output>
+      <output name="MAIN3">elevator</output>
+      <output name="MAIN4">rudder</output>
+      <output name="MAIN5">rudder (second, optional)</output>
+      <output name="MAIN6">throttle</output>
+      <output name="MAIN7">wheel</output>
+      <output name="AUX1">prerotator (optional)</output>
+      <output name="AUX2">release_device (optional)</output>
+    </airframe>
+  </airframe_group>
   <airframe_group image="HelicopterCoaxial" name="Coaxial Helicopter">
     <airframe id="15001" maintainer="Emmanuel Roussel" name="Esky (Big) Lama v4">
       <class>Copter</class>