4 files changed, 22 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 7696c3db1..4cf529ec0 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -40,6 +40,7 @@
 #include "net/adminhandler.h"
 #include "net/chathandler.h"
 #include "net/guildhandler.h"
+#include "net/homunculushandler.h"
 #include "net/net.h"
 #include "net/pethandler.h"
 #include "net/serverfeatures.h"
@@ -700,4 +701,14 @@ impHandler(setPetName)
     return true;
 }
 
+impHandler(setHomunculusName)
+{
+    const std::string args = event.args;
+    if (args.empty())
+        return false;
+
+    homunculusHandler->setName(args);
+    return true;
+}
+
 }  // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 5dce9ac87..5a1bffddb 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -74,6 +74,7 @@ namespace Actions
     decHandler(serverIgnoreWhisper);
     decHandler(serverUnIgnoreWhisper);
     decHandler(setPetName);
+    decHandler(setHomunculusName);
 }  // namespace Actions
 
 #undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 74c3a90f8..36adeda3c 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -484,6 +484,7 @@ namespace InputAction
         TARGET_MERCENARY,
         TARGET_PET,
         PET_SET_NAME,
+        HOMUNCULUS_SET_NAME,
         TOTAL
     };
 }  // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 9b0a6f363..6f4d1e32f 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4098,6 +4098,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
         InputCondition::INGAME,
         "setpetname|petsetname",
         false},
+    {"keyHomunculusSetName",
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        Input::GRP_DEFAULT,
+        &Actions::setHomunculusName,
+        InputAction::NO_VALUE, 50,
+        InputCondition::INGAME,
+        "sethomunname|homunsetname|sethomunculusname|homunculussetname",
+        false}
 };
 
 #endif  // INPUT_INPUTACTIONMAP_H