diff --git a/Mage.Sets/src/mage/cards/c/ChromeCompanion.java b/Mage.Sets/src/mage/cards/c/ChromeCompanion.java
new file mode 100644
index 00000000000..ca4b07a39b2
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/ChromeCompanion.java
@@ -0,0 +1,49 @@
+package mage.cards.c;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BecomesTappedSourceTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.PutOnLibraryTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.target.common.TargetCardInGraveyard;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ChromeCompanion extends CardImpl {
+
+    public ChromeCompanion(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{2}");
+
+        this.subtype.add(SubType.DOG);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(1);
+
+        // Whenever this creature becomes tapped, you gain 1 life.
+        this.addAbility(new BecomesTappedSourceTriggeredAbility(new GainLifeEffect(1)));
+
+        // {2}, {T}: Put target card from a graveyard on the bottom of its owner's library.
+        Ability ability = new SimpleActivatedAbility(new PutOnLibraryTargetEffect(false), new GenericManaCost(2));
+        ability.addCost(new TapSourceCost());
+        ability.addTarget(new TargetCardInGraveyard());
+        this.addAbility(ability);
+    }
+
+    private ChromeCompanion(final ChromeCompanion card) {
+        super(card);
+    }
+
+    @Override
+    public ChromeCompanion copy() {
+        return new ChromeCompanion(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/EdgeOfEternities.java b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
index a49bdea1a08..5887cbd1a93 100644
--- a/Mage.Sets/src/mage/sets/EdgeOfEternities.java
+++ b/Mage.Sets/src/mage/sets/EdgeOfEternities.java
@@ -36,6 +36,7 @@ public final class EdgeOfEternities extends ExpansionSet {
         cards.add(new SetCardInfo("Breeding Pool", 278, Rarity.RARE, mage.cards.b.BreedingPool.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Breeding Pool", 373, Rarity.RARE, mage.cards.b.BreedingPool.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Bygone Colossus", 235, Rarity.UNCOMMON, mage.cards.b.BygoneColossus.class));
+        cards.add(new SetCardInfo("Chrome Companion", 236, Rarity.COMMON, mage.cards.c.ChromeCompanion.class));
         cards.add(new SetCardInfo("Command Bridge", 252, Rarity.COMMON, mage.cards.c.CommandBridge.class));
         cards.add(new SetCardInfo("Consult the Star Charts", 325, Rarity.RARE, mage.cards.c.ConsultTheStarCharts.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Consult the Star Charts", 51, Rarity.RARE, mage.cards.c.ConsultTheStarCharts.class, NON_FULL_USE_VARIOUS));