diff --git a/Mage.Sets/src/mage/cards/o/ObsessiveAstronomer.java b/Mage.Sets/src/mage/cards/o/ObsessiveAstronomer.java
new file mode 100644
index 0000000000..d2f66adf95
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/o/ObsessiveAstronomer.java
@@ -0,0 +1,42 @@
+package mage.cards.o;
+
+import mage.MageInt;
+import mage.abilities.common.BecomeDayAsEntersAbility;
+import mage.abilities.common.BecomesDayOrNightTriggeredAbility;
+import mage.abilities.effects.common.discard.DiscardAndDrawThatManyEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class ObsessiveAstronomer extends CardImpl {
+
+    public ObsessiveAstronomer(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
+
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.WIZARD);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // If it's neither day nor night, it becomes day as Obsessive Astronomer enters the battlefield.
+        this.addAbility(new BecomeDayAsEntersAbility());
+
+        // Whenever day becomes night or night becomes day, discard up to two cards, then draw that many cards.
+        this.addAbility(new BecomesDayOrNightTriggeredAbility(new DiscardAndDrawThatManyEffect(2)));
+    }
+
+    private ObsessiveAstronomer(final ObsessiveAstronomer card) {
+        super(card);
+    }
+
+    @Override
+    public ObsessiveAstronomer copy() {
+        return new ObsessiveAstronomer(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
index 6d81e9cae9..cfe454e822 100644
--- a/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
+++ b/Mage.Sets/src/mage/sets/InnistradMidnightHunt.java
@@ -119,6 +119,7 @@ public final class InnistradMidnightHunt extends ExpansionSet {
         cards.add(new SetCardInfo("Mystic Monstrosity", 256, Rarity.UNCOMMON, mage.cards.m.MysticMonstrosity.class));
         cards.add(new SetCardInfo("Mystic Skull", 256, Rarity.UNCOMMON, mage.cards.m.MysticSkull.class));
         cards.add(new SetCardInfo("Neblegast Intruder", 64, Rarity.UNCOMMON, mage.cards.n.NeblegastIntruder.class));
+        cards.add(new SetCardInfo("Obsessive Astronomer", 152, Rarity.UNCOMMON, mage.cards.o.ObsessiveAstronomer.class));
         cards.add(new SetCardInfo("Odric's Outrider", 29, Rarity.UNCOMMON, mage.cards.o.OdricsOutrider.class));
         cards.add(new SetCardInfo("Organ Hoarder", 66, Rarity.COMMON, mage.cards.o.OrganHoarder.class));
         cards.add(new SetCardInfo("Overgrown Farmland", 265, Rarity.RARE, mage.cards.o.OvergrownFarmland.class));