diff --git a/Mage.Sets/src/mage/cards/k/Kithkeeper.java b/Mage.Sets/src/mage/cards/k/Kithkeeper.java
new file mode 100644
index 00000000000..3e6115efbd8
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/k/Kithkeeper.java
@@ -0,0 +1,61 @@
+package mage.cards.k;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapTargetCost;
+import mage.abilities.dynamicvalue.common.ColorsAmongControlledPermanentsCount;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.AbilityWord;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.StaticFilters;
+import mage.game.permanent.token.KithkinGreenWhiteToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class Kithkeeper extends CardImpl {
+
+    public Kithkeeper(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{W}");
+
+        this.subtype.add(SubType.ELEMENTAL);
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Vivid -- When this creature enters, create X 1/1 green and white Kithkin creature tokens, where X is the number of colors among permanents you control.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(
+                new KithkinGreenWhiteToken(), ColorsAmongControlledPermanentsCount.ALL_PERMANENTS
+        )).setAbilityWord(AbilityWord.VIVID).addHint(ColorsAmongControlledPermanentsCount.ALL_PERMANENTS.getHint()));
+
+        // Tap three untapped creatures you control: This creature gets +3/+0 and gains flying until end of turn.
+        Ability ability = new SimpleActivatedAbility(
+                new BoostSourceEffect(3, 0, Duration.EndOfTurn)
+                        .setText("{this} gets +3/+0"),
+                new TapTargetCost(3, StaticFilters.FILTER_CONTROLLED_UNTAPPED_CREATURES)
+        );
+        ability.addEffect(new GainAbilitySourceEffect(
+                FlyingAbility.getInstance(), Duration.EndOfTurn
+        ).setText("and gains flying until end of turn"));
+        this.addAbility(ability);
+    }
+
+    private Kithkeeper(final Kithkeeper card) {
+        super(card);
+    }
+
+    @Override
+    public Kithkeeper copy() {
+        return new Kithkeeper(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/LorwynEclipsed.java b/Mage.Sets/src/mage/sets/LorwynEclipsed.java
index 27feaeefe67..4709aea4f3b 100644
--- a/Mage.Sets/src/mage/sets/LorwynEclipsed.java
+++ b/Mage.Sets/src/mage/sets/LorwynEclipsed.java
@@ -138,6 +138,7 @@ public final class LorwynEclipsed extends ExpansionSet {
         cards.add(new SetCardInfo("Kinsbaile Aspirant", 21, Rarity.UNCOMMON, mage.cards.k.KinsbaileAspirant.class));
         cards.add(new SetCardInfo("Kirol, Attentive First-Year", 231, Rarity.RARE, mage.cards.k.KirolAttentiveFirstYear.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Kirol, Attentive First-Year", 374, Rarity.RARE, mage.cards.k.KirolAttentiveFirstYear.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Kithkeeper", 23, Rarity.UNCOMMON, mage.cards.k.Kithkeeper.class));
         cards.add(new SetCardInfo("Kulrath Mystic", 56, Rarity.COMMON, mage.cards.k.KulrathMystic.class));
         cards.add(new SetCardInfo("Kulrath Zealot", 148, Rarity.COMMON, mage.cards.k.KulrathZealot.class));
         cards.add(new SetCardInfo("Lasting Tarfire", 149, Rarity.UNCOMMON, mage.cards.l.LastingTarfire.class));