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 77f7d1eb6..cdf632f0f 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
@@ -24,6 +24,7 @@
- Added "Bolg, Servant of Sauron"
- Added "Barrels"
- Added "Burglar's Contract"
+- Added "Old Thrush"
17 Dec. 2015
- "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java
new file mode 100644
index 000000000..e7e3be1a3
--- /dev/null
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/shire/Card31_042.java
@@ -0,0 +1,69 @@
+package com.gempukku.lotro.cards.set31.shire;
+
+import com.gempukku.lotro.cards.AbstractFollower;
+import com.gempukku.lotro.cards.PlayConditions;
+import com.gempukku.lotro.cards.effects.ChoiceEffect;
+import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDeckIntoDiscardEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDeckIntoHandEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDiscardIntoHandEffect;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Phase;
+import com.gempukku.lotro.common.Side;
+import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.game.PhysicalCard;
+import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.actions.ActivateCardAction;
+import com.gempukku.lotro.logic.timing.Action;
+import com.gempukku.lotro.logic.timing.Effect;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * •Old Thrush [Shire]
+ Follower • Bird
+ Twilight Cost 1
+ Strength bonus: +1
+ 'Aid - Exert Bilbo.
+ Maneuver: Discard this follower to take into hand a Free Peoples card (except [Gandalf] or [Elven]) from your draw deck
+ or discard pile.'
+ */
+public class Card31_042 extends AbstractFollower {
+ public Card31_042() {
+ super(Side.FREE_PEOPLE, 1, 1, 0, 0, Culture.SHIRE, "Old Thrush", null, true);
+ }
+
+ @Override
+ protected boolean canPayAidCost(LotroGame game, PhysicalCard self) {
+ return PlayConditions.canExert(self, game, Filters.name("Bilbo"));
+ }
+
+ @Override
+ protected Effect getAidCost(LotroGame game, Action action, PhysicalCard self) {
+ return new ChooseAndExertCharactersEffect(action, self.getOwner(), 1, 1, Filters.name("Bilbo"));
+ }
+
+ @Override
+ protected List extends Action> getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
+ if (PlayConditions.canUseFPCardDuringPhase(game, Phase.MANEUVER, self)
+ && PlayConditions.canSelfDiscard(self, game)) {
+ ActivateCardAction action= new ActivateCardAction(self);
+ action.appendCost(
+ new SelfDiscardEffect(self));
+ List possibleEffects = new LinkedList();
+ possibleEffects.add(
+ new ChooseAndPutCardFromDeckIntoHandEffect(action, playerId, 1, 1, Side.FREE_PEOPLE,
+ Filters.not(Filters.or(Culture.GANDALF, Culture.ELVEN))));
+ possibleEffects.add(
+ new ChooseAndPutCardFromDiscardIntoHandEffect(action, playerId, 1, 1, Side.FREE_PEOPLE,
+ Filters.not(Filters.or(Culture.GANDALF, Culture.ELVEN))));
+ action.appendEffect(
+ new ChoiceEffect(action, playerId, possibleEffects));
+ return Collections.singletonList(action);
+ }
+ return null;
+ }
+}