diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 55a9012..4ad510a 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -54,5 +54,6 @@
 *NeighborInfo.neighbors max_count:10
 
 *DeviceMetadata.firmware_version max_size:18
+*DeviceMetadata:remote_hardware_pins max_count:4
 
 *RemoteHardwarePin.name         max_size:15
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index fa9dbd5..fb34864 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1468,6 +1468,11 @@ message Neighbor {
    * Device hardware model
    */
   HardwareModel hw_model = 9;
+
+  /*
+   * Available GPIO pins for RemoteHardware module
+   */
+  repeated RemoteHardwarePin remote_hardware_pins = 10;
 }
 
 /*