diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index 05c975a..184700a 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -10,7 +10,6 @@ option swift_prefix = "";
 
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
-import "meshtastic/device_metadata.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/module_config.proto";
 import "meshtastic/connection_status.proto";
diff --git a/meshtastic/device_metadata.options b/meshtastic/device_metadata.options
deleted file mode 100644
index d1c7f95..0000000
--- a/meshtastic/device_metadata.options
+++ /dev/null
@@ -1 +0,0 @@
-*DeviceMetadata.firmware_version max_size:18
diff --git a/meshtastic/device_metadata.proto b/meshtastic/device_metadata.proto
deleted file mode 100644
index 59ab00a..0000000
--- a/meshtastic/device_metadata.proto
+++ /dev/null
@@ -1,62 +0,0 @@
-syntax = "proto3";
-
-package meshtastic;
-
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "DeviceMetadataProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
-import "meshtastic/config.proto";
-import "meshtastic/mesh.proto";
-
-/*
- * Device metadata response 
- */
-message DeviceMetadata {
-  /*
-   * Device firmware version string
-   */
-  string firmware_version = 1;
-
-  /*
-   * Device state version
-   */
-  uint32 device_state_version = 2;
-
-  /*
-   * Indicates whether the device can shutdown CPU natively or via power management chip
-   */
-  bool canShutdown = 3;
-
-  /*
-   * Indicates that the device has native wifi capability
-   */
-  bool hasWifi = 4;
-
-  /*
-   * Indicates that the device has native bluetooth capability
-   */
-  bool hasBluetooth = 5;
-
-  /*
-   * Indicates that the device has an ethernet peripheral
-   */
-  bool hasEthernet = 6;
-
-  /*
-   * Indicates that the device's role in the mesh
-   */
-  Config.DeviceConfig.Role role = 7;
-
-  /*
-   * Indicates the device's current enabled position flags
-   */
-  uint32 position_flags = 8;
-
-  /*
-   * Device hardware model
-   */
-  HardwareModel hw_model = 9;
-}
diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 35c753b..eb4b02b 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -47,4 +47,6 @@
 *Compressed.data max_size:237
 
 *Waypoint.name         max_size:30
-*Waypoint.description  max_size:100
\ No newline at end of file
+*Waypoint.description  max_size:100
+
+*DeviceMetadata.firmware_version max_size:18
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index d4bcd6b..8f93cf3 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1304,6 +1304,11 @@ message FromRadio {
      * File Transfer Chunk
      */
     XModem xmodemPacket = 12;
+
+    /*
+     * Device metadata message
+     */
+    DeviceMetadata metadata = 13;
   }
 }
 
@@ -1366,3 +1371,53 @@ message Compressed {
    */
   bytes data = 2;
 }
+
+/*
+ * Device metadata response
+ */
+ message DeviceMetadata {
+  /*
+   * Device firmware version string
+   */
+  string firmware_version = 1;
+
+  /*
+   * Device state version
+   */
+  uint32 device_state_version = 2;
+
+  /*
+   * Indicates whether the device can shutdown CPU natively or via power management chip
+   */
+  bool canShutdown = 3;
+
+  /*
+   * Indicates that the device has native wifi capability
+   */
+  bool hasWifi = 4;
+
+  /*
+   * Indicates that the device has native bluetooth capability
+   */
+  bool hasBluetooth = 5;
+
+  /*
+   * Indicates that the device has an ethernet peripheral
+   */
+  bool hasEthernet = 6;
+
+  /*
+   * Indicates that the device's role in the mesh
+   */
+  Config.DeviceConfig.Role role = 7;
+
+  /*
+   * Indicates the device's current enabled position flags
+   */
+  uint32 position_flags = 8;
+
+  /*
+   * Device hardware model
+   */
+  HardwareModel hw_model = 9;
+}
\ No newline at end of file