diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 4856fe0e01..33e40266d4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/09
+	* Fixed the dancer/bard soul-linked skills toggling on/off with each call
+	  to pc_calc_status. [Skotlex]
 	* Fixed a bug in the pc_skillreset function which allowed TK rankers to
 	  accumulate skill points. [Skotlex]
 	* Fixed a major memory leak in status.c causing the last column of job_db1.txt
diff --git a/src/map/pc.c b/src/map/pc.c
index 86c298376d..753fa84553 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -999,7 +999,6 @@ int pc_calc_skilltree(struct map_session_data *sd)
 			sd->status.skill[i].lv=(sd->status.skill[i].flag==1)?0:sd->status.skill[i].flag-2;
 			sd->status.skill[i].flag=0;
 		}
-		else
 		if(sd->sc.count && sd->sc.data[SC_SPIRIT].timer != -1 && sd->sc.data[SC_SPIRIT].val2 == SL_BARDDANCER && i >= DC_HUMMING && i<= DC_SERVICEFORYOU)
 		{ //Enable Bard/Dancer spirit linked skills.
 			if (sd->status.sex) { //Link dancer skills to bard.
@@ -6946,15 +6945,6 @@ int pc_equipitem(struct map_session_data *sd,int n,int pos)
 	}
 	status_calc_pc(sd,0);
 
-	if(sd->special_state.infinite_endure) {
-		if(sd->sc.data[SC_ENDURE].timer == -1)
-			status_change_start(&sd->bl,SC_ENDURE,100,10,1,0,0,0,0);
-	}
-	else {
-		if(sd->sc.count && sd->sc.data[SC_ENDURE].timer != -1 && sd->sc.data[SC_ENDURE].val2)
-			status_change_end(&sd->bl,SC_ENDURE,-1);
-	}
-
 	if(sd->sc.count) {
 		if (sd->sc.data[SC_SIGNUMCRUCIS].timer != -1 && !battle_check_undead(7,sd->def_ele))
 			status_change_end(&sd->bl,SC_SIGNUMCRUCIS,-1);