diff --git a/Mage.Sets/src/mage/cards/r/RoboticsMastery.java b/Mage.Sets/src/mage/cards/r/RoboticsMastery.java
new file mode 100644
index 00000000000..6502bf00d18
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/r/RoboticsMastery.java
@@ -0,0 +1,55 @@
+package mage.cards.r;
+
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.AttachEffect;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.BoostEnchantedEffect;
+import mage.abilities.keyword.EnchantAbility;
+import mage.abilities.keyword.FlashAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.game.permanent.token.RobotFlyingToken;
+import mage.target.TargetPermanent;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class RoboticsMastery extends CardImpl {
+
+    public RoboticsMastery(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{U}");
+
+        this.subtype.add(SubType.AURA);
+
+        // Flash
+        this.addAbility(FlashAbility.getInstance());
+
+        // Enchant creature
+        TargetPermanent auraTarget = new TargetCreaturePermanent();
+        this.getSpellAbility().addTarget(auraTarget);
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.BoostCreature));
+        this.addAbility(new EnchantAbility(auraTarget));
+
+        // When this Aura enters, create two 1/1 colorless Robot artifact creature tokens with flying.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new RobotFlyingToken(), 2)));
+
+        // Enchanted creature gets +2/+2.
+        this.addAbility(new SimpleStaticAbility(new BoostEnchantedEffect(2, 2)));
+    }
+
+    private RoboticsMastery(final RoboticsMastery card) {
+        super(card);
+    }
+
+    @Override
+    public RoboticsMastery copy() {
+        return new RoboticsMastery(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java b/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
index 6e5abaf9b37..caa44aa956a 100644
--- a/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
+++ b/Mage.Sets/src/mage/sets/MarvelsSpiderMan.java
@@ -159,6 +159,7 @@ public final class MarvelsSpiderMan extends ExpansionSet {
         cards.add(new SetCardInfo("Rent Is Due", 247, Rarity.RARE, mage.cards.r.RentIsDue.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Rhino, Barreling Brute", 140, Rarity.UNCOMMON, mage.cards.r.RhinoBarrelingBrute.class));
         cards.add(new SetCardInfo("Risky Research", 62, Rarity.COMMON, mage.cards.r.RiskyResearch.class));
+        cards.add(new SetCardInfo("Robotics Mastery", 41, Rarity.UNCOMMON, mage.cards.r.RoboticsMastery.class));
         cards.add(new SetCardInfo("Rocket-Powered Goblin Glider", 172, Rarity.RARE, mage.cards.r.RocketPoweredGoblinGlider.class));
         cards.add(new SetCardInfo("Romantic Rendezvous", 86, Rarity.COMMON, mage.cards.r.RomanticRendezvous.class));
         cards.add(new SetCardInfo("Sandman, Shifting Scoundrel", 112, Rarity.RARE, mage.cards.s.SandmanShiftingScoundrel.class, NON_FULL_USE_VARIOUS));
diff --git a/Mage/src/main/java/mage/game/permanent/token/RobotFlyingToken.java b/Mage/src/main/java/mage/game/permanent/token/RobotFlyingToken.java
new file mode 100644
index 00000000000..43350acd33a
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/RobotFlyingToken.java
@@ -0,0 +1,31 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.abilities.keyword.FlyingAbility;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+/**
+ * @author TheElk801
+ */
+public final class RobotFlyingToken extends TokenImpl {
+
+    public RobotFlyingToken() {
+        super("Robot Token", "1/1 colorless Robot artifact creature tokens with flying");
+        cardType.add(CardType.ARTIFACT);
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.ROBOT);
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+
+        addAbility(FlyingAbility.getInstance());
+    }
+
+    private RobotFlyingToken(final RobotFlyingToken token) {
+        super(token);
+    }
+
+    public RobotFlyingToken copy() {
+        return new RobotFlyingToken(this);
+    }
+}