diff --git a/msg/CMakeLists.txt b/msg/CMakeLists.txt
index f294ea66c0..95bc589664 100644
--- a/msg/CMakeLists.txt
+++ b/msg/CMakeLists.txt
@@ -237,7 +237,6 @@ set(msg_files
 	VehicleTorqueSetpoint.msg
 	VelocityLimits.msg
 	WheelEncoders.msg
-	Wind.msg
 	YawEstimatorStatus.msg
 	versioned/ActuatorMotors.msg
 	versioned/ActuatorServos.msg
@@ -271,6 +270,7 @@ set(msg_files
 	versioned/VehicleRatesSetpoint.msg
 	versioned/VehicleStatus.msg
 	versioned/VtolVehicleStatus.msg
+	versioned/Wind.msg
 )
 list(SORT msg_files)
 
diff --git a/msg/Wind.msg b/msg/versioned/Wind.msg
similarity index 96%
rename from msg/Wind.msg
rename to msg/versioned/Wind.msg
index ff8b6f4535..7a53f9bfa7 100644
--- a/msg/Wind.msg
+++ b/msg/versioned/Wind.msg
@@ -1,3 +1,5 @@
+uint32 MESSAGE_VERSION = 0
+
 uint64 timestamp		# time since system start (microseconds)
 uint64 timestamp_sample         # the timestamp of the raw data (microseconds)