diff --git a/Mage.Sets/src/mage/cards/a/AlacrianArmory.java b/Mage.Sets/src/mage/cards/a/AlacrianArmory.java
new file mode 100644
index 00000000000..7f0f5f5286c
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AlacrianArmory.java
@@ -0,0 +1,118 @@
+package mage.cards.a;
+
+import java.util.UUID;
+
+import mage.abilities.Ability;
+import mage.abilities.common.CrewSaddleIncreasedPowerAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.EndTurnEffect;
+import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect;
+import mage.abilities.effects.common.continuous.BoostControlledEffect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.keyword.CrewAbility;
+import mage.abilities.keyword.SaddleAbility;
+import mage.abilities.keyword.VigilanceAbility;
+import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.permanent.SaddledSourceThisTurnPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.target.TargetPermanent;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author Jmlundeen
+ */
+public final class AlacrianArmory extends CardImpl {
+
+    private static final FilterCreaturePermanent creatureFilter = new FilterCreaturePermanent("Creatures you control");
+    private static final FilterPermanent mountOrVehicleFilter = new FilterPermanent("Mount or Vehicle you control");
+
+    static {
+        mountOrVehicleFilter.add(Predicates.or(
+            SubType.MOUNT.getPredicate(),
+            SubType.VEHICLE.getPredicate()
+        ));
+        mountOrVehicleFilter.add(TargetController.YOU.getControllerPredicate());
+    }
+    public AlacrianArmory(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}{W}");
+
+        // Creatures you control get +0/+1 and have vigilance.
+        Ability staticAbility = new SimpleStaticAbility(new BoostControlledEffect(0, 1, Duration.WhileOnBattlefield, creatureFilter));
+        Effect effect = new GainAbilityControlledEffect(VigilanceAbility.getInstance(), Duration.WhileOnBattlefield, creatureFilter);
+        effect.setText("and have vigilance");
+        staticAbility.addEffect(effect);
+        this.addAbility(staticAbility);
+        // At the beginning of combat on your turn, choose up to one target Mount or Vehicle you control. Until end of turn, that permanent becomes saddled if it's a Mount and becomes an artifact creature if it's a Vehicle.
+        Ability animateAbility = new BeginningOfCombatTriggeredAbility(
+            new AlacrianArmoryAnimateEffect()
+        );
+        animateAbility.addTarget(new TargetPermanent(0, 1, mountOrVehicleFilter));
+        this.addAbility(animateAbility);
+    }
+
+    private AlacrianArmory(final AlacrianArmory card) {
+        super(card);
+    }
+
+    @Override
+    public AlacrianArmory copy() {
+        return new AlacrianArmory(this);
+    }
+}
+
+class AlacrianArmoryAnimateEffect extends OneShotEffect {
+
+    AlacrianArmoryAnimateEffect() {
+        super(Outcome.Benefit);
+        staticText = "choose up to one target Mount or Vehicle you control. " +
+                         "Until end of turn, that permanent becomes saddled if it's a Mount " +
+                         "and becomes an artifact creature if it's a Vehicle";
+    }
+
+    private AlacrianArmoryAnimateEffect(final AlacrianArmoryAnimateEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public AlacrianArmoryAnimateEffect copy() {
+        return new AlacrianArmoryAnimateEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent target = game.getPermanent(source.getFirstTarget());
+        if (target == null) {
+            return false;
+        }
+        if (target.hasSubtype(SubType.MOUNT, game)) {
+            target.getAbilities().stream().filter(
+                ability -> ability instanceof SaddleAbility)
+                .findFirst()
+                .ifPresent(ability -> game.fireEvent(GameEvent.getEvent(
+                    GameEvent.EventType.MOUNT_SADDLED,
+                    ability.getSourceId(),
+                    ability, source.getControllerId()))
+                );
+        }
+        if (target.hasSubtype(SubType.VEHICLE, game)) {
+            game.addEffect(new AddCardTypeTargetEffect(Duration.EndOfTurn, CardType.CREATURE, CardType.ARTIFACT)
+                               .setTargetPointer(new FixedTarget(target, game)), source);
+        }
+        return true;
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/Aetherdrift.java b/Mage.Sets/src/mage/sets/Aetherdrift.java
index 16d9f565e22..3b72036604f 100644
--- a/Mage.Sets/src/mage/sets/Aetherdrift.java
+++ b/Mage.Sets/src/mage/sets/Aetherdrift.java
@@ -28,6 +28,7 @@ public final class Aetherdrift extends ExpansionSet {
         cards.add(new SetCardInfo("Afterburner Expert", 150, Rarity.RARE, mage.cards.a.AfterburnerExpert.class));
         cards.add(new SetCardInfo("Agonasaur Rex", 151, Rarity.RARE, mage.cards.a.AgonasaurRex.class));
         cards.add(new SetCardInfo("Air Response Unit", 1, Rarity.UNCOMMON, mage.cards.a.AirResponseUnit.class));
+        cards.add(new SetCardInfo("Alacrian Armory", 2, Rarity.UNCOMMON, mage.cards.a.AlacrianArmory.class));
         cards.add(new SetCardInfo("Alacrian Jaguar", 152, Rarity.COMMON, mage.cards.a.AlacrianJaguar.class));
         cards.add(new SetCardInfo("Amonkhet Raceway", 248, Rarity.UNCOMMON, mage.cards.a.AmonkhetRaceway.class));
         cards.add(new SetCardInfo("Ancient Vendetta", 75, Rarity.UNCOMMON, mage.cards.a.AncientVendetta.class));