diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index 60cd2d128..b2ce26ceb 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -6,6 +6,7 @@
 images.
 - "Shire-songs" should no longer cause an error and cancel the game.
 - "Aragorn, Dunedain Ranger" trigger is now an optional one.
+- "Merry, Pipeweed Aficionado" now requires to exert twice to use its ability.
 
 <b>10 Mar. 2013</b>
 - Free people cards should no longer allow playing shadow cards and vice-versa.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_397.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_397.java
index 953778beb..5293b3c75 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_397.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/shire/Card20_397.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Shire	Companion • Hobbit
  * 3 	4	8
  * Add 1 to the number of pipes you can spot.
- * At the start of the fellowship phase, you may exert Merry to play a pipeweed possession from your draw deck.
+ * At the start of the fellowship phase, you may exert Merry twice to play a pipeweed possession from your draw deck.
  */
 public class Card20_397 extends AbstractCompanion {
     public Card20_397() {
@@ -37,8 +37,10 @@ public class Card20_397 extends AbstractCompanion {
     @Override
     public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
         if (TriggerConditions.startOfPhase(game, effectResult, Phase.FELLOWSHIP)
-                && PlayConditions.canSelfExert(self, game)) {
+                && PlayConditions.canSelfExert(self, 2, game)) {
             OptionalTriggerAction action = new OptionalTriggerAction(self);
+            action.appendCost(
+                    new SelfExertEffect(action, self));
             action.appendCost(
                     new SelfExertEffect(action, self));
             action.appendEffect(