diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 83e53bad11..a5ffeba861 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/11/27
+	* Fixed the Homunculus hungry timer not starting on login. [Skotlex]
 	* Added logging for standard GM commands (/mm /b /kick etc) [KarLaeda]
 	* Some cleanups on the trade_additem function. When specifying a qty of 0,
 	  an ack will be returned to the client so it doesn't gets stuck. [Skotlex]
diff --git a/src/map/clif.c b/src/map/clif.c
index be3309aa3e..5d6dded437 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8400,6 +8400,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 
 		if(sd->pd && sd->pd->pet.intimate > 900)
 			clif_pet_emotion(sd->pd,(sd->pd->pet.class_ - 100)*100 + 50 + pet_hungry_val(sd->pd));
+		if(sd->hd)
+			merc_hom_init_timers(sd->hd);
 
 		//Delayed night effect on log-on fix for the glow-issue. Thanks to Larry.
 		if (night_flag && map[sd->bl.m].flag.nightenabled)