diff --git a/Mage.Sets/src/mage/sets/tempest/FlailingDrake.java b/Mage.Sets/src/mage/sets/tempest/FlailingDrake.java
new file mode 100644
index 0000000000..27c4a83cb5
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/tempest/FlailingDrake.java
@@ -0,0 +1,72 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.sets.tempest;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BlocksOrBecomesBlockedByCreatureTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+
+/**
+ *
+ * @author anonymous
+ */
+public class FlailingDrake extends CardImpl {
+
+    public FlailingDrake(UUID ownerId) {
+        super(ownerId, 121, "Flailing Drake", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{3}{G}");
+        this.expansionSetCode = "TMP";
+        this.subtype.add("Drake");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+        // Whenever Flailing Drake blocks or becomes blocked by a creature, that creature gets +1/+1 until end of turn.
+        Effect effect = new BoostTargetEffect(+1, +1, Duration.EndOfTurn);
+        effect.setText("that creature gets +1/+1 until end of turn");
+        Ability ability = new BlocksOrBecomesBlockedByCreatureTriggeredAbility(effect, false);
+        this.addAbility(ability);
+    }
+
+    public FlailingDrake(final FlailingDrake card) {
+        super(card);
+    }
+
+    @Override
+    public FlailingDrake copy() {
+        return new FlailingDrake(this);
+    }
+}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FlailingDrakeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FlailingDrakeTest.java
new file mode 100644
index 0000000000..a51c58a2c1
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FlailingDrakeTest.java
@@ -0,0 +1,58 @@
+package org.mage.test.cards.single;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author anonymous
+ *
+ *   Whenever Flailing Drake blocks or becomes blocked by a creature, that creature gets +1/+1 until end of turn.
+ */
+public class FlailingDrakeTest extends CardTestPlayerBase {
+
+    @Test
+    public void testIncreaseBlocker() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 1); 
+        addCard(Zone.BATTLEFIELD, playerA, "Flailing Drake", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Forest", 3);
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 3); 
+        addCard(Zone.BATTLEFIELD, playerB, "Snapping Drake", 1);
+        
+        attack(3, playerA, "Flailing Drake");
+        block(3, playerB, "Snapping Drake", "Flailing Drake");
+
+        setStopAt(3, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+        
+        assertGraveyardCount(playerA, "Flailing Drake", 1);
+        //Snapping Drake 4/3
+        assertPowerToughness(playerB, "Snapping Drake", 4, 3);
+    }
+    
+    @Test
+    public void testIncreaseBlocked() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 1); 
+        addCard(Zone.BATTLEFIELD, playerA, "Flailing Drake", 1);
+
+        addCard(Zone.BATTLEFIELD, playerB, "Forest", 3);
+        addCard(Zone.BATTLEFIELD, playerB, "Island", 3); 
+        addCard(Zone.BATTLEFIELD, playerB, "Snapping Drake", 1);
+        
+        attack(4, playerB, "Snapping Drake");
+        block(4, playerA, "Flailing Drake", "Snapping Drake");
+
+        setStopAt(4, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+        
+        assertGraveyardCount(playerA, "Flailing Drake", 1);
+        //Snapping Drake 4/3
+        assertPowerToughness(playerB, "Snapping Drake", 4, 3);
+    }
+
+}