diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e1ce5779c8..062af6b740 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/16
+	* Fixed null-pointer crash on Evolving a homunculus. [Skotlex]
 	* @produce now can make any kind of equipment [Skotlex]
 	* Made HLIF_AVOID and HAMI_DEFENCE cause the status change on both caster
 	  and target. [Skotlex]
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index e76e1bcac5..6c5ffe9235 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -353,7 +353,7 @@ int merc_hom_evolution(struct homun_data *hd)
 	y = hd->bl.y;
 	merc_hom_vaporize(sd, 0);
 	unit_free(&hd->bl);
-	merc_call_homunculus(hd->master, x, y);
+	merc_call_homunculus(sd, x, y);
 	clif_emotion(&sd->bl, 21) ;	//no1
 	clif_misceffect2(&hd->bl,568);
 	return 1 ;