diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2199543d70..3f862a8770 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/07/13
+	* Tuned up some more NJ_KAENSIN based on Tharis's information. [Skotlex]
 	* Corrected NJ_KAENSIN as per description. [Skotlex]
 	* Fixed a leaking map_freeblocklock on skill_del_unitgroup. [Skotlex]
 	* Changed the default save interval to 5 minutes. Added support for
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 8994d42d61..3a401581cb 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -88,7 +88,7 @@
 484,0xb8,    ,  2, 0,1000,enemy, 0x808	//HW_GRAVITATION
 488,0xb9,    ,  3, 0,  -1,all,   0x200	//CG_HERMODE
 527,0xba,    , -1, 0,2000,enemy, 0x000	//NJ_TATAMIGAESHI
-535,0xbd,    ,  2, 0,2000,enemy, 0x008	//NJ_KAENSIN
+535,0xbd,    ,  2, 0, 100,enemy, 0x008	//NJ_KAENSIN
 541,0x86,,0,2:2:3:3:4,1000,enemy,0x000 //NJ_RAIGEKISAI
 538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010	//NJ_SUITON
 516,0xbc,    ,  0, 3, 100,enemy, 0x000	//GS_DESPERADO
diff --git a/src/map/skill.c b/src/map/skill.c
index b55c6bea89..be9343d7a9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6408,7 +6408,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
 		if (sd) val1 = sd->status.child;
 		break;
 	case NJ_KAENSIN:
-		val1 = (skilllv+1)/2 + 4;
+		val2 = (skilllv+1)/2 + 4;
 		skill_clear_group(src,1);
 		break;
 
@@ -6461,6 +6461,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
 		uy = y + layout->dy[i];
 		switch (skillid) {
 		case MG_FIREWALL:		/* ファイヤーウォール */
+		case NJ_KAENSIN:
 			val2=group->val2;
 			break;
 		case WZ_ICEWALL:		/* アイスウォール */
@@ -7031,8 +7032,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
 
 		case UNT_KAENSIN:
 			skill_attack(BF_MAGIC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
-			if (--sg->val1 <= 0)
-				skill_delunitgroup(NULL,sg);
+			if (--src->val2 <= 0)
+				skill_delunit(src);
 			break;
 	}