diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 669f962473..f1790d1b1c 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/07/12
+	* Resurrection will now silently fail when used on non-undead + not-dead
+	  characters. [Skotlex]
 	* Poem of bragi/magic String's base delay reduction at level 10 (or above)
 	  is now 50% instead of 3*lv%. [Skotlex]
 	* status_damage will no longer fail when the target is not on a map AND the
diff --git a/src/map/unit.c b/src/map/unit.c
index 80c4a7260f..2845ff60bc 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -850,7 +850,8 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
 		if(battle_check_undead(tstatus->race,tstatus->def_ele)){	
 			temp=1;
 			casttime = skill_castfix(src, PR_TURNUNDEAD, skill_lv);
-		}
+		} else if (!status_isdead(target))
+			return 0; //Can't cast on non-dead characters.
 		break;
 	case MO_FINGEROFFENSIVE:
 		if(sd)