diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 77479ce..1bae5eb 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -74,6 +74,7 @@
 *StoreForwardPlusPlus.root_hash max_size:32
 *StoreForwardPlusPlus.message max_size:240
 
+*StatusMessage.status max_size:80
 
 # MyMessage.name         max_size:40 
 # or fixed_length or fixed_count, or max_count
@@ -94,4 +95,4 @@
 
 *ChunkedPayload.chunk_count int_size:16
 *ChunkedPayload.chunk_index int_size:16
-*ChunkedPayload.payload_chunk max_size:228
\ No newline at end of file
+*ChunkedPayload.payload_chunk max_size:228
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index ecb8803..3117af2 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1311,6 +1311,13 @@ message Waypoint {
   fixed32 icon = 8;
 }
 
+/*
+ * Message for node status
+ */
+message StatusMessage {
+  string status = 1;
+}
+
 /*
  * This message will be proxied over the PhoneAPI for the client to deliver to the MQTT server
  */
diff --git a/meshtastic/module_config.options b/meshtastic/module_config.options
index bf2a5f4..95151b0 100644
--- a/meshtastic/module_config.options
+++ b/meshtastic/module_config.options
@@ -27,3 +27,5 @@
 *DetectionSensorConfig.monitor_pin int_size:8
 *DetectionSensorConfig.name max_size:20
 *DetectionSensorConfig.detection_trigger_type max_size:8
+
+*StatusMessage.node_status max_size:80
diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto
index 7825937..ac13a56 100644
--- a/meshtastic/module_config.proto
+++ b/meshtastic/module_config.proto
@@ -769,6 +769,16 @@ message ModuleConfig {
     uint32 blue = 5;
   }
 
+  /*
+   * StatusMessage config - Allows setting a status message for a node to periodically rebroadcast
+   */
+  message StatusMessageConfig {
+    /*
+     * The actual status string
+     */
+    string node_status = 1;
+  }
+
   /*
    * TODO: REPLACE
    */
@@ -837,6 +847,11 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     PaxcounterConfig paxcounter = 13;
+
+    /*
+     * TODO: REPLACE
+     */
+    StatusMessageConfig statusmessage = 14;
   }
 }
 
diff --git a/meshtastic/portnums.proto b/meshtastic/portnums.proto
index 221f113..918b063 100644
--- a/meshtastic/portnums.proto
+++ b/meshtastic/portnums.proto
@@ -142,6 +142,14 @@ enum PortNum {
    */
   STORE_FORWARD_PLUSPLUS_APP = 35;
 
+  /*
+   * Node Status module
+   * ENCODING: protobuf
+   * This module allows setting an extra string of status for a node.
+   * Broadcasts on change and on a timer, possibly once a day.
+   */
+  NODE_STATUS_APP = 36;
+
   /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.
    * Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic