diff --git a/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc b/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
index 8c78ea79d2b59374e540aa1d45ff3a2683ac677f..7acfc92ab6e2e95e453907d684ba2fa2132f87a6 100644
--- a/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
+++ b/src/FirmwarePlugin/APM/APMFirmwarePluginFactory.cc
@@ -46,6 +46,13 @@ FirmwarePlugin* APMFirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPIL
                 _arduCopterPluginInstance = new ArduCopterFirmwarePlugin;
             }
             return _arduCopterPluginInstance;
+        case MAV_TYPE_VTOL_DUOROTOR:
+        case MAV_TYPE_VTOL_QUADROTOR:
+        case MAV_TYPE_VTOL_TILTROTOR:
+        case MAV_TYPE_VTOL_RESERVED2:
+        case MAV_TYPE_VTOL_RESERVED3:
+        case MAV_TYPE_VTOL_RESERVED4:
+        case MAV_TYPE_VTOL_RESERVED5:
         case MAV_TYPE_FIXED_WING:
             if (!_arduPlanePluginInstance) {
                 _arduPlanePluginInstance = new ArduPlaneFirmwarePlugin;