diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 63012b0c7e..b8d83a13ed 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/08/02
+	* Fixed homunculus error message [Toms]
 	* Rewrote pc_payzeny to not use doubles, it may more accurately prevent
 	  charging a player more zeny than they can withhold. [Skotlex]
 	* Fixed failing to create Deadly Poison Bottles damaging 50% of your max
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index f5e65f98bc..afc355f942 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -397,6 +397,9 @@
 401: You have been jailed for %d years, %d months, %d days, %d hours and %d minutes
 402: %s in jail for %d years, %d months, %d days, %d hours and %d minutes
 
+// Homunculus messages
+450: You already have an homunculus
+
 // Messages of others (not for GM commands)
 // ----------------------------------------
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 667b89ff14..640fcba904 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9807,7 +9807,7 @@ atcommand_makehomun(
 	}
 	else
 	{
-		clif_displaymessage(fd,msg_txt(144));
+		clif_displaymessage(fd,msg_txt(450));
 	}
 	return 0;
 }