diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 240eec6a0d..243febb6f4 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/05/05
+	* The Rest bonus activated by using /doridori while in rest should now
+	  trigger with all the class tree (TK/SL/SG) [Skotlex]
 	* Fixed Kaupe always triggering when the one who was under Kaupe was a
 	  player rather than the one attacking... [Skotlex]
 	* /doridori now won't double the HP/SP regen of TKs, it only activates
diff --git a/src/map/clif.c b/src/map/clif.c
index 3b3f47a7c7..95a3a5c298 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10824,7 +10824,7 @@ void clif_parse_NoviceDoriDori(int fd, struct map_session_data *sd) {
 	if ((sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
 		sd->doridori_counter++;
 	
-	if ((sd->class_&MAPID_UPPERMASK) == MAPID_TAEKWON
+	if ((sd->class_&MAPID_BASEMASK) == MAPID_TAEKWON
 		&& sd->state.rest && (level = pc_checkskill(sd,TK_SPTIME)))
 		sc_start(&sd->bl,SkillStatusChangeTable[TK_SPTIME],100,level,skill_get_time(TK_SPTIME, level));
 	return;