diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a1e1b7babe..89a853b24b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/21
+	* Fixed call homunc bug when the homunc was vapo and the master has change
+	  of map [Toms]
 	* Fixed SQL-Guild Creation, guild name was escaped 2 times [Toms]
 	* Some cleaning of the splash skills. Updated skill-attack to enable again
 	  passing of flag 0xF000 which signals that the skill level sent to the
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 46108fbb68..068143f0ab 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -708,6 +708,7 @@ int merc_call_homunculus(struct map_session_data *sd, short x, short y)
 	{	//Spawn him
 		hd->bl.x = x;
 		hd->bl.y = y;
+		hd->bl.m = sd->bl.m;
 		map_addblock(&hd->bl);
 		clif_spawn(&hd->bl);
 		clif_send_homdata(sd,SP_ACK,0);