diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 901caa893e..faf9ac3c47 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/06/01
+	* Fixed Autoblitz taking into account target's luck rather than attacker's
+	  [Skotlex]
 	* Fixed slaves warping endlessly to their master when the master-slave
 	  distance exceeds 30. [Skotlex]
 	* SC_ORCISH will now be dispelled on logout (if debufF_on_logout is set)
diff --git a/src/map/skill.c b/src/map/skill.c
index b6ed041478..9fea5bbee2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -988,7 +988,7 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 		if(sd) {
 			// Automatic trigger of Blitz Beat
 			if (pc_isfalcon(sd) && sd->status.weapon == W_BOW && (skill=pc_checkskill(sd,HT_BLITZBEAT))>0 &&
-				rand()%1000 <= tstatus->luk*10/3+1 ) {
+				rand()%1000 <= sstatus->luk*10/3+1 ) {
 				int lv=(sd->status.job_level+9)/10;
 				skill_castend_damage_id(src,bl,HT_BLITZBEAT,(skill<lv)?skill:lv,tick,0xf00000);
 			}