diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d4caa9fc0a..ecda39262d 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/04/06
+	* Changed the default of skill_add_range to 0, said value now disables
+	  skill-range checking when casting ends. [Skotlex]
 	* Corrected the Soul Drain formula, thanks to Haplo for pointing it out.
 	  [Skotlex]
 	* Addded missing aldeg_cas01 to NOWARP mapflags, thanks to Justin84 [Lupus]
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index dc7bdf659c..4f80bbf040 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -51,7 +51,8 @@ skill_delay_attack_enable: yes
 
 // Range added to skills after their cast time finishes.
 // Decides how far away the target can walk away after the skill began casting before the skill fails.
-skill_add_range: 15
+// 0 disables this range checking (default)
+//skill_add_range: 15
 
 // If the target moves out of range while casting, do we take the items and SP for the skill anyway? (Note 1)
 skill_out_range_consume: no
diff --git a/src/map/skill.c b/src/map/skill.c
index 623e623025..b440fbae1d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5700,7 +5700,8 @@ int skill_castend_id( int tid, unsigned int tick, int id,int data )
 				break;
 		}
 
-		if(src != target && !check_distance_bl(src, target, skill_get_range2(src,ud->skillid,ud->skilllv)+battle_config.skill_add_range))
+		if(src != target && battle_config.skill_add_range &&
+			!check_distance_bl(src, target, skill_get_range2(src,ud->skillid,ud->skilllv)+battle_config.skill_add_range))
 		{
 			if (sd) {
 				clif_skill_fail(sd,ud->skillid,0,0);
@@ -5812,7 +5813,8 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data )
 		{	//Avoid double checks on instant cast skills. [Skotlex]
 			if (!status_check_skilluse(src, NULL, ud->skillid, 1))
 				break;
-			if(!check_distance_blxy(src, ud->skillx, ud->skilly, skill_get_range2(src,ud->skillid,ud->skilllv)+battle_config.skill_add_range)) {
+			if(battle_config.skill_add_range &&
+				!check_distance_blxy(src, ud->skillx, ud->skilly, skill_get_range2(src,ud->skillid,ud->skilllv)+battle_config.skill_add_range)) {
 				if (sd && battle_config.skill_out_range_consume) //Consume items anyway.
 					skill_check_condition(sd,ud->skillid, ud->skilllv,1);
 				break;