diff --git a/Mage.Sets/src/mage/cards/c/ComponentCollector.java b/Mage.Sets/src/mage/cards/c/ComponentCollector.java
new file mode 100644
index 0000000000..d744368d1a
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/c/ComponentCollector.java
@@ -0,0 +1,45 @@
+package mage.cards.c;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.BecomeDayAsEntersAbility;
+import mage.abilities.common.BecomesDayOrNightTriggeredAbility;
+import mage.abilities.effects.common.MayTapOrUntapTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.target.common.TargetNonlandPermanent;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ComponentCollector extends CardImpl {
+
+    public ComponentCollector(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}");
+
+        this.subtype.add(SubType.HOMUNCULUS);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(4);
+
+        // If it's neither day nor night, it becomes day as Component Collector enters the battlefield.
+        this.addAbility(new BecomeDayAsEntersAbility());
+
+        // Whenever day becomes night or night becomes day, you may tap or untap target nonland permanent.
+        Ability ability = new BecomesDayOrNightTriggeredAbility(new MayTapOrUntapTargetEffect());
+        ability.addTarget(new TargetNonlandPermanent());
+        this.addAbility(ability);
+    }
+
+    private ComponentCollector(final ComponentCollector card) {
+        super(card);
+    }
+
+    @Override
+    public ComponentCollector copy() {
+        return new ComponentCollector(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
index 62b4e6af5e..65036dd7c2 100644
--- a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
+++ b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
@@ -68,6 +68,7 @@ public final class InnistradMidnightHunt extends ExpansionSet {
         cards.add(new SetCardInfo("Chaplain of Alms", 13, Rarity.UNCOMMON, mage.cards.c.ChaplainOfAlms.class));
         cards.add(new SetCardInfo("Clarion Cathars", 14, Rarity.COMMON, mage.cards.c.ClarionCathars.class));
         cards.add(new SetCardInfo("Clear Shot", 176, Rarity.UNCOMMON, mage.cards.c.ClearShot.class));
+        cards.add(new SetCardInfo("Component Collector", 43, Rarity.COMMON, mage.cards.c.ComponentCollector.class));
         cards.add(new SetCardInfo("Consider", 44, Rarity.COMMON, mage.cards.c.Consider.class));
         cards.add(new SetCardInfo("Contortionist Troupe", 178, Rarity.UNCOMMON, mage.cards.c.ContortionistTroupe.class));
         cards.add(new SetCardInfo("Corpse Cobble", 214, Rarity.UNCOMMON, mage.cards.c.CorpseCobble.class));