diff --git a/meshtastic/admin.options b/meshtastic/admin.options
index 3f94fe250..f66a2fce5 100644
--- a/meshtastic/admin.options
+++ b/meshtastic/admin.options
@@ -8,6 +8,7 @@
 *AdminMessage.InputEvent.kb_char int_size:8
 *AdminMessage.InputEvent.touch_x int_size:16
 *AdminMessage.InputEvent.touch_y int_size:16
+*AdminMessage.FindNodeResponse.result int_size:8
 
 *AdminMessage.set_canned_message_module_messages max_size:201
 *AdminMessage.get_canned_message_module_messages_response max_size:201
diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto
index cfbea7291..e8f3123a8 100644
--- a/meshtastic/admin.proto
+++ b/meshtastic/admin.proto
@@ -220,6 +220,49 @@ message AdminMessage {
     bytes ota_hash = 2;
   }
 
+  /*
+   * Request that the node emit an audible find-node pattern.
+   */
+  message FindNodeRequest {
+    /*
+     * Stop any active find-node pattern instead of starting a new one.
+     */
+    bool stop = 1;
+  }
+
+  /*
+   * Response to a find-node request.
+   */
+  message FindNodeResponse {
+    enum Result {
+      /*
+       * Find-node pattern started.
+       */
+      STARTED = 0;
+
+      /*
+       * Find-node pattern stopped.
+       */
+      STOPPED = 1;
+
+      /*
+       * Request could not run because the node has no buzzer/audio output.
+       */
+      NO_BUZZER = 2;
+
+      /*
+       * Request could not run because buzzer/audio output is disabled.
+       */
+      BUZZER_DISABLED = 3;
+    }
+
+    /*
+     * Result of the request.
+     */
+    Result result = 1;
+
+  }
+
   /*
    * TODO: REPLACE
    */
@@ -473,6 +516,16 @@ message AdminMessage {
      */
     KeyVerificationAdmin key_verification = 67;
 
+    /*
+     * Start or stop the audible find-node pattern.
+     */
+    FindNodeRequest find_node_request = 68;
+
+    /*
+     * Result of a find-node request.
+     */
+    FindNodeResponse find_node_response = 69;
+
     /*
      * Tell the node to factory reset config everything; all device state and configuration will be returned to factory defaults and BLE bonds will be cleared.
      */
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index 507f636d7..ee859705a 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -2684,6 +2684,11 @@ message DeviceMetadata {
    * (bitwise OR of ExcludedModules)
    */
   uint32 excluded_modules = 12;
+
+  /*
+   * Indicates that the device has a buzzer or audio output usable by the find-node command
+   */
+  bool hasBuzzer = 13;
 }
 
 /*