diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index 4793215d0..7d2b77d64 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -7,6 +7,7 @@
 - "Peering Forward" now adds the strength penalty till Regroup, rather than end of phase.
 - "Gandalf's Pipe" is now a Fellowship activated ability, not a trigger (per card text).
 - "Uruk Bloodfiend" now has 9 Strength (per card text).
+- "Dunlending Ruffian" assigns itself to the companion, only if it is alive.
 
 <b>13 Mar. 2013</b>
 - "Waylayed" now wounds 1 companion 4 times, instead of 4 companions once.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_010.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_010.java
index 2d3630ea0..449d60924 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_010.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dunland/Card20_010.java
@@ -46,12 +46,16 @@ public class Card20_010 extends AbstractMinion {
                     new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.not(Filters.ringBearer)) {
                         @Override
                         protected void cardSelected(LotroGame game, final PhysicalCard companion) {
+                            final int companionId = companion.getCardId();
+                            final int minionId = self.getCardId();
                             action.appendEffect(
                                     new AddUntilEndOfPhaseActionProxyEffect(
                                             new AbstractActionProxy() {
                                                 @Override
                                                 public List<? extends RequiredTriggerAction> getRequiredAfterTriggers(LotroGame game, EffectResult effectResult) {
-                                                    if (TriggerConditions.startOfPhase(game, effectResult, Phase.ASSIGNMENT)) {
+                                                    if (TriggerConditions.startOfPhase(game, effectResult, Phase.ASSIGNMENT)
+                                                            && PlayConditions.isActive(game, companion) && companion.getCardId() == companionId
+                                                            && PlayConditions.isActive(game, self) && self.getCardId() == minionId) {
                                                         RequiredTriggerAction action = new RequiredTriggerAction(self);
                                                         action.appendEffect(
                                                                 new AssignmentEffect(playerId, companion, self));