diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e713c6af35..29c0899d81 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/05/22
+	* Updated skill_delayfix to return 0 for mobs since they have no skill
+	  delay other than the one specified in mob_skill_db [Skotlex]
 	* Corrected the 20 lvl diff 15% exp bonus on pk_mode servers. Thanks to
 	  Vayu for pointing it out. [Skotlex]
 	* status_get_sc_tick will now use directly Stun's formula rather than
diff --git a/src/map/skill.c b/src/map/skill.c
index 784f088ae6..c122b2dd2a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -8309,6 +8309,9 @@ int skill_delayfix(struct block_list *bl, int skill_id, int skill_lv)
 	
 	nullpo_retr(0, bl);
 
+	if (bl->type == BL_MOB)
+		return 0; //Mobs have no delay other than the skill-specific delay in their skill db. [Skotlex]
+	
 	// instant cast attack skills depend on aspd as delay [celest]
 	if (time == 0) {
 		if (skill_get_type(skill_id) == BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_DAMAGE))