diff --git a/Mage.Sets/src/mage/cards/t/ThunderhawkGunship.java b/Mage.Sets/src/mage/cards/t/ThunderhawkGunship.java
new file mode 100644
index 0000000000..7fd3d5e7c9
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/t/ThunderhawkGunship.java
@@ -0,0 +1,57 @@
+package mage.cards.t;
+
+import mage.MageInt;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.keyword.CrewAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.StaticFilters;
+import mage.game.permanent.token.AstartesWarriorToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ThunderhawkGunship extends CardImpl {
+
+    public ThunderhawkGunship(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}");
+
+        this.subtype.add(SubType.VEHICLE);
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // When Thunderhawk Gunship enters the battlefield, create two 2/2 white Astartes Warrior creature tokens with vigilance.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(
+                new CreateTokenEffect(new AstartesWarriorToken(), 2)
+        ));
+
+        // Whenever Thunderhawk Gunship attacks, attacking creatures you control gain flying until end of turn.
+        this.addAbility(new AttacksTriggeredAbility(new GainAbilityControlledEffect(
+                FlyingAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_ATTACKING_CREATURES
+        )));
+
+        // Crew 2
+        this.addAbility(new CrewAbility(2));
+    }
+
+    private ThunderhawkGunship(final ThunderhawkGunship card) {
+        super(card);
+    }
+
+    @Override
+    public ThunderhawkGunship copy() {
+        return new ThunderhawkGunship(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/Warhammer40000.java b/Mage.Sets/src/mage/sets/Warhammer40000.java
index bb4e025ebc..59636eadd2 100644
--- a/Mage.Sets/src/mage/sets/Warhammer40000.java
+++ b/Mage.Sets/src/mage/sets/Warhammer40000.java
@@ -195,6 +195,7 @@ public final class Warhammer40000 extends ExpansionSet {
         cards.add(new SetCardInfo("Their Name Is Death", 62, Rarity.RARE, mage.cards.t.TheirNameIsDeath.class));
         cards.add(new SetCardInfo("Thornwood Falls", 302, Rarity.COMMON, mage.cards.t.ThornwoodFalls.class));
         cards.add(new SetCardInfo("Thought Vessel", 259, Rarity.COMMON, mage.cards.t.ThoughtVessel.class));
+        cards.add(new SetCardInfo("Thunderhawk Gunship", 167, Rarity.RARE, mage.cards.t.ThunderhawkGunship.class));
         cards.add(new SetCardInfo("Thunderwolf Cavalry", 16, Rarity.UNCOMMON, mage.cards.t.ThunderwolfCavalry.class));
         cards.add(new SetCardInfo("Tranquil Cove", 303, Rarity.COMMON, mage.cards.t.TranquilCove.class));
         cards.add(new SetCardInfo("Trygon Prime", 143, Rarity.UNCOMMON, mage.cards.t.TrygonPrime.class));
diff --git a/Mage/src/main/java/mage/game/permanent/token/AstartesWarriorToken.java b/Mage/src/main/java/mage/game/permanent/token/AstartesWarriorToken.java
new file mode 100644
index 0000000000..305af9875b
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/AstartesWarriorToken.java
@@ -0,0 +1,36 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.Arrays;
+
+/**
+ * @author TheElk801
+ */
+public final class AstartesWarriorToken extends TokenImpl {
+
+    public AstartesWarriorToken() {
+        super("Astartes Warrior Token", "2/2 white Astartes Warrior creature tokens with vigilance");
+        cardType.add(CardType.CREATURE);
+        color.setWhite(true);
+        subtype.add(SubType.ASTARTES);
+        subtype.add(SubType.WARRIOR);
+        power = new MageInt(2);
+        toughness = new MageInt(2);
+        addAbility(VigilanceAbility.getInstance());
+
+        availableImageSetCodes.addAll(Arrays.asList("40K"));
+    }
+
+    public AstartesWarriorToken(final AstartesWarriorToken token) {
+        super(token);
+    }
+
+    @Override
+    public AstartesWarriorToken copy() {
+        return new AstartesWarriorToken(this);
+    }
+}