diff --git a/src/modules/mavlink/mavlink_receiver.cpp b/src/modules/mavlink/mavlink_receiver.cpp
index 06fb97c8a6..df25057559 100644
--- a/src/modules/mavlink/mavlink_receiver.cpp
+++ b/src/modules/mavlink/mavlink_receiver.cpp
@@ -2110,6 +2110,12 @@ MavlinkReceiver::handle_message_manual_control(mavlink_message_t *msg)
 	manual_control_setpoint.yaw = mavlink_manual_control.r / 1000.f;
 	// Pass along the button states
 	manual_control_setpoint.buttons = mavlink_manual_control.buttons;
+	manual_control_setpoint.aux1 = mavlink_manual_control.aux1;
+	manual_control_setpoint.aux2 = mavlink_manual_control.aux2;
+	manual_control_setpoint.aux3 = mavlink_manual_control.aux3;
+	manual_control_setpoint.aux4 = mavlink_manual_control.aux4;
+	manual_control_setpoint.aux5 = mavlink_manual_control.aux5;
+	manual_control_setpoint.aux6 = mavlink_manual_control.aux6;
 	manual_control_setpoint.data_source = manual_control_setpoint_s::SOURCE_MAVLINK_0 + _mavlink.get_instance_id();
 	manual_control_setpoint.timestamp = manual_control_setpoint.timestamp_sample = hrt_absolute_time();
 	manual_control_setpoint.valid = true;