diff --git a/msg/vehicle_local_position_setpoint.msg b/msg/vehicle_local_position_setpoint.msg
index ac427b0e67..0093d52d77 100644
--- a/msg/vehicle_local_position_setpoint.msg
+++ b/msg/vehicle_local_position_setpoint.msg
@@ -7,10 +7,13 @@ uint64 timestamp	# time since system start (microseconds)
 float32 x		# in meters NED
 float32 y		# in meters NED
 float32 z		# in meters NED
-float32 yaw		# in radians NED -PI..+PI
-float32 yawspeed	# in radians/sec
+
 float32 vx		# in meters/sec
 float32 vy		# in meters/sec
 float32 vz		# in meters/sec
+
 float32[3] acceleration # in meters/sec^2
 float32[3] thrust	# normalized thrust vector in NED
+
+float32 yaw		# in radians NED -PI..+PI
+float32 yawspeed	# in radians/sec