diff --git a/qgcimages.qrc b/qgcimages.qrc
index 6f06746..446cea1 100644
--- a/qgcimages.qrc
+++ b/qgcimages.qrc
@@ -26,6 +26,7 @@
         <file alias="Airframe/Rover">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
         <file alias="Airframe/VTOLDuoRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
         <file alias="Airframe/VTOLPlane">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
+        <file alias="Airframe/VTOLPlaneOcto">src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg</file>
         <file alias="Airframe/VTOLQuadRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
         <file alias="Airframe/VTOLTiltRotor">src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
         <file alias="Airframe/Y6A">src/AutoPilotPlugins/Common/Images/Y6A.svg</file>
diff --git a/src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg b/src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg
new file mode 100644
index 0000000..63a215a
--- /dev/null
+++ b/src/AutoPilotPlugins/Common/Images/VTOLPlaneOcto.svg
@@ -0,0 +1,184 @@
+<?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 387.573 324.704"
+   enable-background="new 0 0 387.573 324.704"
+   xml:space="preserve"
+   sodipodi:docname="VTOLPlaneOcto.svg"
+   inkscape:version="0.92.4 (unknown)"><metadata
+   id="metadata31106"><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>VTOLPlane</dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs31104" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="2499"
+   inkscape:window-height="1385"
+   id="namedview31102"
+   showgrid="false"
+   inkscape:zoom="5.8145263"
+   inkscape:cx="211.34573"
+   inkscape:cy="115.91408"
+   inkscape:window-x="1920"
+   inkscape:window-y="27"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="draw" /><title
+   id="title31061">VTOLPlane</title>
+<g
+   transform="matrix(0.94101707,0,0,0.93544727,53.661025,-8.8226817)"
+   style="opacity:0.8"
+   id="g13148"><ellipse
+     style="fill:#4ec3e8"
+     transform="matrix(0.7051,-0.7091,0.7091,0.7051,-42.389,60.0411)"
+     cx="50.998001"
+     cy="80.987999"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13146" /></g><g
+   transform="matrix(0.94101707,0,0,0.93544727,51.762199,5.2379583)"
+   style="opacity:0.8"
+   id="g13152"><ellipse
+     style="fill:#159e1f"
+     transform="matrix(0.7091,-0.7051,0.7051,0.7091,-175.5156,116.1654)"
+     cx="53.018002"
+     cy="270.78299"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13150" /></g><rect
+   x="97.976318"
+   y="48.492847"
+   stroke-miterlimit="10"
+   width="6.0243912"
+   height="196.95419"
+   id="rect31063"
+   style="fill:#ffffff;stroke:#000000;stroke-width:0.99031782;stroke-miterlimit:10" /><g
+   transform="matrix(0.94101707,0,0,0.93544727,51.590216,10.39745)"
+   style="opacity:0.8"
+   id="g13178"><ellipse
+     style="fill:#4ec3e8"
+     transform="matrix(0.7091,-0.7051,0.7051,0.7091,-154.3615,107.4372)"
+     cx="53.018002"
+     cy="240.783"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13176" /></g><g
+   transform="matrix(0.94101707,0,0,0.93544727,52.323311,0.41970752)"
+   style="opacity:0.8"
+   id="g13184"><ellipse
+     style="fill:#159e1f"
+     transform="matrix(0.7051,-0.7091,0.7091,0.7051,-20.6859,52.2355)"
+     cx="52.464001"
+     cy="50.990002"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13182" /></g><path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10"
+   stroke-miterlimit="10"
+   d="m 109.14381,40.699131 c 4.12541,4.091647 4.13388,10.732387 0.0179,14.834323 -4.116,4.101001 -10.796285,4.10942 -14.922645,0.01777 -4.11695,-4.083228 -4.13483,-10.708065 -0.0395,-14.812808 4.07931,-4.113162 10.740765,-4.158998 14.878415,-0.103835 0.0226,0.02152 0.0442,0.04303 0.0659,0.06455 z"
+   id="path13186" /><g
+   transform="matrix(0.94101707,0,0,0.93544727,54.540866,-9.6677085)"
+   style="opacity:0.8"
+   id="g13160"><ellipse
+     style="fill:#159e1f"
+     transform="matrix(0.7091,-0.7051,0.7051,0.7091,12.8117,194.3173)"
+     cx="241.89101"
+     cy="81.633003"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13158" /></g><g
+   transform="matrix(0.94101707,0,0,0.93544727,53.712714,3.0726401)"
+   style="opacity:0.8"
+   id="g13156"><ellipse
+     style="fill:#4ec3e8"
+     transform="matrix(0.7051,-0.7091,0.7091,0.7051,-120.5748,251.2775)"
+     cx="241.845"
+     cy="270.616"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13154" /></g><rect
+   x="278.65158"
+   y="50.402733"
+   stroke-miterlimit="10"
+   width="6.0243912"
+   height="195.04433"
+   id="rect31065"
+   style="fill:#ffffff;stroke:#000000;stroke-width:0.98550457;stroke-miterlimit:10" /><g
+   transform="matrix(0.94101707,0,0,0.93544727,53.712714,12.015759)"
+   style="opacity:0.8"
+   id="g13190"><ellipse
+     style="fill:#159e1f"
+     transform="matrix(0.7051,-0.7091,0.7091,0.7051,-99.3026,242.4316)"
+     cx="241.845"
+     cy="240.616"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13188" /></g><path
+   stroke-miterlimit="10"
+   d="m 191.11066,324.23416 h 55.57177 c -11.91987,-23.69675 -26.66184,-24.32163 -26.66184,-24.32163 h -21.64057 l 5.01845,-116.6194 c 0,0 134.56544,-5.76891 169.38307,-6.85964 -15.99729,-39.445 -66.49886,-41.00346 -66.49886,-41.00346 h -98.65246 v -34.92305 c 0,0 0.62389,-29.635907 -14.27241,-29.466591 h -4.49429 c -14.87843,0.220765 -14.27241,29.466591 -14.27241,29.466591 v 34.92305 H 75.941462 c 0,0 -50.501563,1.55939 -66.4988526,41.00346 34.8176316,1.09167 169.3830806,6.85964 169.3830806,6.85964 l 5.01844,116.6194 h -21.64339 c 0,0 -14.74292,0.62581 -26.66184,24.32163 h 55.57176"
+   id="path31091"
+   inkscape:connector-curvature="0"
+   style="fill:#4ec3e8;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10" /><path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10"
+   stroke-miterlimit="10"
+   d="m 273.84202,244.5352 c -4.12542,-4.09165 -4.13389,-10.73239 -0.0179,-14.83432 4.116,-4.10101 10.79628,-4.10942 14.92264,-0.0178 4.11695,4.08323 4.13483,10.70807 0.0395,14.81281 -4.07931,4.11316 -10.74077,4.159 -14.87842,0.10383 -0.0226,-0.0215 -0.0442,-0.043 -0.0659,-0.0645 z"
+   id="path13192" /><path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10"
+   stroke-miterlimit="10"
+   d="m 94.011265,243.03383 c 4.11601,4.101 10.796295,4.10942 14.922655,0.0178 4.12542,-4.09165 4.13389,-10.73239 0.0179,-14.83432 -4.10754,-4.09258 -10.771825,-4.11036 -14.901015,-0.0393 -4.13765,4.05516 -4.18376,10.67719 -0.10445,14.79036 0.0216,0.0225 0.0433,0.044 0.0649,0.0655 z"
+   id="path13180" /><path
+   stroke-miterlimit="10"
+   d="m 56.890572,178.21552 c 36.445593,1.45742 81.596538,3.36106 105.420268,4.37321 l 0.22584,-10.535 -105.393916,-4.67724 c 0,0 -0.160914,6.68003 -0.252192,10.83903 z"
+   id="path31093"
+   inkscape:connector-curvature="0"
+   style="fill:#159e1f;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10" /><g
+   transform="matrix(0.94101707,0,0,0.93544727,54.784087,-0.18209844)"
+   style="opacity:0.8"
+   id="g13172"><ellipse
+     style="fill:#4ec3e8"
+     transform="matrix(0.7091,-0.7051,0.7051,0.7091,33.9659,185.5891)"
+     cx="241.89101"
+     cy="51.632999"
+     rx="50.993"
+     ry="51.004002"
+     id="ellipse13170" /></g><path
+   stroke-miterlimit="10"
+   d="m 325.25077,178.31561 c -36.4456,1.45743 -81.59654,3.36106 -105.42026,4.37322 l -0.22585,-10.53501 105.39391,-4.67724 c 0,0 0.16092,6.68003 0.2522,10.83903 z"
+   id="path31095"
+   inkscape:connector-curvature="0"
+   style="fill:#159e1f;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10" /><path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:#000000;stroke-width:0.93822801;stroke-miterlimit:10"
+   stroke-miterlimit="10"
+   d="m 289.88028,40.700689 c -4.11601,-4.101001 -10.79629,-4.10942 -14.92265,-0.01777 -4.12542,4.091647 -4.13389,10.732387 -0.0179,14.834323 4.10754,4.092582 10.77182,4.110355 14.901,0.03929 4.13766,-4.055164 4.18377,-10.677195 0.10446,-14.790357 -0.0217,-0.02245 -0.0433,-0.04397 -0.0649,-0.06548 z"
+   id="path13174" /><polygon
+   stroke-miterlimit="10"
+   points="232.841,311.188 232.841,324.188 154.731,324.204 154.731,311.188 "
+   id="polygon31097"
+   transform="matrix(0.94101707,0,0,0.93544727,8.7547264,20.959348)"
+   style="fill:#159e1f;stroke:#000000;stroke-miterlimit:10" /><polygon
+   stroke-miterlimit="10"
+   points="189.395,298.355 198.228,298.355 196.228,324.022 191.395,324.022 "
+   id="polygon31099"
+   transform="matrix(0.94101707,0,0,0.93544727,8.7547264,20.959348)"
+   style="fill:#159e1f;stroke:#000000;stroke-miterlimit:10" /></svg>
\ No newline at end of file
diff --git a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
index 97b9a04..4c76961 100644
--- a/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
+++ b/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
@@ -786,6 +786,26 @@
       <output name="MAIN6">elevon left</output>
     </airframe>
   </airframe_group>
+  <airframe_group image="VTOLPlaneOcto" name="VTOL Octoplane">
+    <airframe id="13050" maintainer="" name="Generic Octoplane VTOL">
+      <class>VTOL</class>
+      <maintainer />
+      <type>VTOL Octoplane</type>
+      <output name="MAIN1">motor 1</output>
+      <output name="MAIN2">motor 2</output>
+      <output name="MAIN3">motor 3</output>
+      <output name="MAIN4">motor 4</output>
+      <output name="MAIN5">motor 5</output>
+      <output name="MAIN6">motor 6</output>
+      <output name="MAIN7">motor 7</output>
+      <output name="MAIN8">motor 8</output>
+      <output name="AUX1">Aileron 1</output>
+      <output name="AUX2">Aileron 2</output>
+      <output name="AUX3">Elevator</output>
+      <output name="AUX4">Rudder</output>
+      <output name="AUX5">Throttle</output>
+    </airframe>
+  </airframe_group>
   <airframe_group image="VTOLQuadRotorTailSitter" name="VTOL Quad Tailsitter">
     <airframe id="13003" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Quadrotor X Tailsitter">
       <class>VTOL</class>