diff --git a/Mage.Sets/src/mage/cards/g/GimliOfTheGlitteringCaves.java b/Mage.Sets/src/mage/cards/g/GimliOfTheGlitteringCaves.java
new file mode 100644
index 00000000000..f9c53a742fd
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/g/GimliOfTheGlitteringCaves.java
@@ -0,0 +1,65 @@
+package mage.cards.g;
+
+import mage.MageInt;
+import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.keyword.DoubleStrikeAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.counters.CounterType;
+import mage.filter.FilterPermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
+import mage.game.permanent.token.TreasureToken;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class GimliOfTheGlitteringCaves extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterCreaturePermanent("another legendary creature");
+
+    static {
+        filter.add(SuperType.LEGENDARY.getPredicate());
+        filter.add(AnotherPredicate.instance);
+    }
+
+    public GimliOfTheGlitteringCaves(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
+
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.DWARF);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(1);
+        this.toughness = new MageInt(1);
+
+        // Double strike
+        this.addAbility(DoubleStrikeAbility.getInstance());
+
+        // Whenever another legendary creature enters the battlefield under your control, put a +1/+1 counter on Gimli of the Glittering Caves.
+        this.addAbility(new EntersBattlefieldControlledTriggeredAbility(
+                new AddCountersSourceEffect(CounterType.P1P1.createInstance()), filter
+        ));
+
+        // Whenever Gimli deals combat damage to a player, create a Treasure token.
+        this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(
+                new CreateTokenEffect(new TreasureToken()), false
+        ));
+    }
+
+    private GimliOfTheGlitteringCaves(final GimliOfTheGlitteringCaves card) {
+        super(card);
+    }
+
+    @Override
+    public GimliOfTheGlitteringCaves copy() {
+        return new GimliOfTheGlitteringCaves(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/TalesOfMiddleEarthCommander.java b/Mage.Sets/src/mage/sets/TalesOfMiddleEarthCommander.java
index fd93f295e5a..510a226eb73 100644
--- a/Mage.Sets/src/mage/sets/TalesOfMiddleEarthCommander.java
+++ b/Mage.Sets/src/mage/sets/TalesOfMiddleEarthCommander.java
@@ -105,6 +105,7 @@ public final class TalesOfMiddleEarthCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Genesis Wave", 245, Rarity.RARE, mage.cards.g.GenesisWave.class));
         cards.add(new SetCardInfo("Ghost Quarter", 314, Rarity.UNCOMMON, mage.cards.g.GhostQuarter.class));
         cards.add(new SetCardInfo("Gilded Goose", 246, Rarity.RARE, mage.cards.g.GildedGoose.class));
+        cards.add(new SetCardInfo("Gimli of the Glittering Caves", 32, Rarity.RARE, mage.cards.g.GimliOfTheGlitteringCaves.class));
         cards.add(new SetCardInfo("Glacial Fortress", 315, Rarity.RARE, mage.cards.g.GlacialFortress.class));
         cards.add(new SetCardInfo("Go for the Throat", 201, Rarity.UNCOMMON, mage.cards.g.GoForTheThroat.class));
         cards.add(new SetCardInfo("Goblin Cratermaker", 218, Rarity.UNCOMMON, mage.cards.g.GoblinCratermaker.class));