diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 753ea5f17f..240eec6a0d 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/05
+	* Fixed Kaupe always triggering when the one who was under Kaupe was a
+	  player rather than the one attacking... [Skotlex]
 	* /doridori now won't double the HP/SP regen of TKs, it only activates
 	  their "happy" state. [Skotlex]
 	* Added the -50 hit penalty when standing on Wall of Fog. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index 0bb50eb76b..c773cc5bfd 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -463,7 +463,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
    	
 		if(sc->data[SC_KAUPE].timer != -1 &&
 			rand()%100 < sc->data[SC_KAUPE].val2 &&
-			(bl->type == BL_PC || !skill_num))
+			(src->type == BL_PC || !skill_num))
 		{	//Kaupe only blocks all skills of players.
 			clif_skill_nodamage(bl,bl,SL_KAUPE,1,1);
 			if (--sc->data[SC_KAUPE].val3 <= 0) //We make it work like Safety Wall, even though it only blocks 1 time.