diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8e8afc5e1d..945d2ad21b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 2006/08/03
+	* Fixed NPC_CRITICALSLASH not being considered as a Critical hit by the
+	  code. [Skotlex]
 	* Added RUDE_ATTACKED_COUNT so you can easily adjust how many rude-attacks
 	  should happen before a mob uses the rude-attacked skill. Value has been set
 	  to 2 for now. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index 225cc96704..0e53bb9e89 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -902,6 +902,10 @@ static struct Damage battle_calc_weapon_attack(
 			case KN_AUTOCOUNTER:
 				wd.flag=(wd.flag&~BF_SKILLMASK)|BF_NORMAL;
 				break;
+
+			case NPC_CRITICALSLASH:
+				flag.cri = 1; //Always critical skill.
+				break;
 		}
 	}