diff --git a/.gitattributes b/.gitattributes
index ebb4abfb3bc..28410670009 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5782,6 +5782,7 @@ forge-gui/res/cardsfolder/h/harsh_justice.txt -text
 forge-gui/res/cardsfolder/h/harsh_mercy.txt -text
 forge-gui/res/cardsfolder/h/haru_onna.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/h/harvest_gwyllion.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/h/harvest_mage.txt -text
 forge-gui/res/cardsfolder/h/harvest_pyre.txt -text
 forge-gui/res/cardsfolder/h/harvest_wurm.txt -text
 forge-gui/res/cardsfolder/h/harvester_druid.txt svneol=native#text/plain
diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
index 5247eb18b1f..2a5fd0f7b0a 100644
--- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
+++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
@@ -593,7 +593,15 @@ public class AbilityManaPart implements java.io.Serializable {
         }
         if (manaReplace.startsWith("Any")) {
             // Replace any type and amount
-            return manaReplace.split("->")[1];
+        	String replaced = manaReplace.split("->")[1];
+        	if (replaced.equals("Any")) {
+                byte rs = MagicColor.GREEN;
+                if (act != null) {
+                    rs = act.getController().chooseColor("Choose a color", sa, ColorSet.fromMask(MagicColor.ALL_COLORS));
+                }
+                replaced = MagicColor.toShortString(rs);
+        	}
+            return replaced;
         }
         final Pattern splitter = Pattern.compile("->");
         // Replace any type
diff --git a/forge-gui/res/cardsfolder/h/harvest_mage.txt b/forge-gui/res/cardsfolder/h/harvest_mage.txt
new file mode 100644
index 00000000000..0c0bb27495e
--- /dev/null
+++ b/forge-gui/res/cardsfolder/h/harvest_mage.txt
@@ -0,0 +1,11 @@
+Name:Harvest Mage
+ManaCost:G
+Types:Creature Human Spellshaper
+PT:1/1
+A:AB$ Effect | Cost$ G T Discard<1/Card> | ReplacementEffects$ HarvestReplacement | SVars$ HarvestProduce | References$ HarvestReplacement,HarvestProduce | AILogic$ RedirectSpellDamageFromPlayer | Stackable$ False | SpellDescription$ Until end of turn, if you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
+SVar:HarvestReplacement:Event$ ProduceMana | ActiveZones$ Command | ValidCard$ Land.YouCtrl | ManaReplacement$ HarvestProduce | Description$ If you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
+SVar:HarvestProduce:Any->Any
+SVar:RemAIDeck:True
+SVar:NonStackingEffect:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/harvest_mage.jpg
+Oracle:{G}, {T}, Discard a card: Until end of turn, if you tap a land for mana, it produces one mana of a color of your choice instead of any other type and amount.
\ No newline at end of file