diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a4eb02aa19..f1e0f39802 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/04/29
+	* Changed the HT_DETECTING method from invoking clif_changetraplook to
+	  clif_skill_setunit since in the first the client ignores the fact that it
+	  is now a trap (rendering skills like Remove Trap useless). [Skotlex]
 	* added script command skillpointcount. Returns total amount of skill
 	  points a char has (the value returned is the same that SkillPoint would
 	  have after invoking a skill reset) [Skotlex]
diff --git a/src/map/skill.c b/src/map/skill.c
index 3ed3a90d23..ea673682de 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2416,7 +2416,9 @@ static int skill_reveal_trap( struct block_list *bl,va_list ap )
 	TBL_SKILL *su = (TBL_SKILL*)bl;
 	if (su->alive && su->group && skill_get_inf2(su->group->skill_id)&INF2_TRAP)
 	{	//Reveal trap.
-		clif_changetraplook(bl, su->group->unit_id);
+		//Change look is not good enough, the client ignores it as an actual trap still. [Skotlex]
+		//clif_changetraplook(bl, su->group->unit_id);
+		clif_skill_setunit(su);
 		return 1;
 	}
 	return 0;