diff --git a/Mage.Sets/src/mage/cards/j/JaheiraFriendOfTheForest.java b/Mage.Sets/src/mage/cards/j/JaheiraFriendOfTheForest.java
new file mode 100644
index 00000000000..03610600b2d
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/j/JaheiraFriendOfTheForest.java
@@ -0,0 +1,57 @@
+package mage.cards.j;
+
+import mage.MageInt;
+import mage.abilities.common.ChooseABackgroundAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.mana.GreenManaAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.filter.FilterPermanent;
+import mage.filter.predicate.permanent.TokenPredicate;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class JaheiraFriendOfTheForest extends CardImpl {
+
+    private static final FilterPermanent filter = new FilterPermanent("Tokens");
+
+    static {
+        filter.add(TokenPredicate.TRUE);
+    }
+
+    public JaheiraFriendOfTheForest(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
+
+        this.addSuperType(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.ELF);
+        this.subtype.add(SubType.DRUID);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(3);
+
+        // Tokens you control have "{T}: Add {G}."
+        this.addAbility(new SimpleStaticAbility(new GainAbilityControlledEffect(
+                new GreenManaAbility(), Duration.WhileOnBattlefield, filter
+        )));
+
+        // Choose a Background
+        this.addAbility(ChooseABackgroundAbility.getInstance());
+    }
+
+    private JaheiraFriendOfTheForest(final JaheiraFriendOfTheForest card) {
+        super(card);
+    }
+
+    @Override
+    public JaheiraFriendOfTheForest copy() {
+        return new JaheiraFriendOfTheForest(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/CommanderLegendsBattleForBaldursGate.java b/Mage.Sets/src/mage/sets/CommanderLegendsBattleForBaldursGate.java
index 2ca92c659b8..cdaf7840586 100644
--- a/Mage.Sets/src/mage/sets/CommanderLegendsBattleForBaldursGate.java
+++ b/Mage.Sets/src/mage/sets/CommanderLegendsBattleForBaldursGate.java
@@ -67,6 +67,7 @@ public final class CommanderLegendsBattleForBaldursGate extends ExpansionSet {
         cards.add(new SetCardInfo("Irenicus's Vile Duplication", 78, Rarity.UNCOMMON, mage.cards.i.IrenicussVileDuplication.class));
         cards.add(new SetCardInfo("Island", 455, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Jaheira's Respite", 238, Rarity.RARE, mage.cards.j.JaheirasRespite.class));
+        cards.add(new SetCardInfo("Jaheira, Friend of the Forest", 237, Rarity.RARE, mage.cards.j.JaheiraFriendOfTheForest.class));
         cards.add(new SetCardInfo("Karlach, Fury of Avernus", 186, Rarity.MYTHIC, mage.cards.k.KarlachFuryOfAvernus.class));
         cards.add(new SetCardInfo("Korlessa, Scale Singer", 280, Rarity.UNCOMMON, mage.cards.k.KorlessaScaleSinger.class));
         cards.add(new SetCardInfo("Lae'zel, Vlaakith's Champion", 29, Rarity.RARE, mage.cards.l.LaezelVlaakithsChampion.class));