diff --git a/Mage.Sets/src/mage/cards/n/NanoformSentinel.java b/Mage.Sets/src/mage/cards/n/NanoformSentinel.java
new file mode 100644
index 00000000000..b2fef7c5de0
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/n/NanoformSentinel.java
@@ -0,0 +1,50 @@
+package mage.cards.n;
+
+import mage.MageInt;
+import mage.abilities.TriggeredAbility;
+import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
+import mage.abilities.effects.common.UntapTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.target.TargetPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author Susucr
+ */
+public final class NanoformSentinel extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("another target permanent");
+
+    static {
+        filter.add(AnotherPredicate.instance);
+    }
+
+    public NanoformSentinel(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}{U}");
+
+        this.subtype.add(SubType.ROBOT);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(2);
+
+        // Whenever this creature becomes tapped, untap another target permanent. This ability triggers only once each turn.
+        TriggeredAbility ability = new BecomesTappedSourceTriggeredAbility(new UntapTargetEffect());
+        ability.addTarget(new TargetPermanent(filter));
+        ability.setTriggersLimitEachTurn(1);
+        this.addAbility(ability);
+    }
+
+    private NanoformSentinel(final NanoformSentinel card) {
+        super(card);
+    }
+
+    @Override
+    public NanoformSentinel copy() {
+        return new NanoformSentinel(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/EdgeOfEternities.java b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
index 3260753baaa..679220ad0b3 100644
--- a/Mage.Sets/src/mage/sets/EdgeOfEternities.java
+++ b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
@@ -208,6 +208,7 @@ public final class EdgeOfEternities extends ExpansionSet {
         cards.add(new SetCardInfo("Mutinous Massacre", 314, Rarity.RARE, mage.cards.m.MutinousMassacre.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Mutinous Massacre", 363, Rarity.MYTHIC, mage.cards.m.MutinousMassacre.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Mutinous Massacre", 389, Rarity.MYTHIC, mage.cards.m.MutinousMassacre.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Nanoform Sentinel", 71, Rarity.COMMON, mage.cards.n.NanoformSentinel.class));
         cards.add(new SetCardInfo("Nebula Dragon", 147, Rarity.COMMON, mage.cards.n.NebulaDragon.class));
         cards.add(new SetCardInfo("Nova Hellkite", 148, Rarity.RARE, mage.cards.n.NovaHellkite.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Nova Hellkite", 309, Rarity.RARE, mage.cards.n.NovaHellkite.class, NON_FULL_USE_VARIOUS));