diff --git a/.gitattributes b/.gitattributes
index 6b1e4beb956..bbf923d8d60 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2160,6 +2160,7 @@ forge-gui/res/cardsfolder/a/aurora_griffin.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/auspicious_ancestor.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/austere_command.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/a/autochthon_wurm.txt -text
+forge-gui/res/cardsfolder/a/autumn_willow.txt -text
 forge-gui/res/cardsfolder/a/autumns_veil.txt -text
 forge-gui/res/cardsfolder/a/avacyn_angel_of_hope.txt -text
 forge-gui/res/cardsfolder/a/avacyn_guardian_angel.txt -text
diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index 0012cdc5460..f789310ef34 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -6194,7 +6194,12 @@ public class Card extends GameEntity implements Comparable<Card> {
                     return;
                 }
                 if (kw.equals("Shroud")) {
-                    result.setFalse();
+                    StringBuilder sb = new StringBuilder();
+                    sb.append("Can target CardUID_").append(String.valueOf(getId()));
+                    sb.append(" with spells and abilities as though it didn't have shroud.");
+                    if (!sa.getActivatingPlayer().hasKeyword(sb.toString())) {
+                        result.setFalse();
+                    }
                 }
                 else if (kw.equals("Hexproof")) {
                     if (sa.getActivatingPlayer().getOpponents().contains(getController())) {
diff --git a/forge-gui/res/cardsfolder/a/autumn_willow.txt b/forge-gui/res/cardsfolder/a/autumn_willow.txt
new file mode 100644
index 00000000000..4a1e2a84f13
--- /dev/null
+++ b/forge-gui/res/cardsfolder/a/autumn_willow.txt
@@ -0,0 +1,9 @@
+Name:Autumn Willow
+ManaCost:4 G G
+Types:Legendary Creature Avatar
+PT:4/4
+K:Shroud
+A:AB$ Pump | Cost$ G | ValidTgts$ Player | Defined$ Targeted | TgtPrompt$ Select target player to be able to target Autumn Willow | KW$ Can target CardUIDSource with spells and abilities as though it didn't have shroud. | DefinedKW$ CardUIDSource | StackDescription$ Until end of turn, {p:Targeted} can target CARDNAME as though it didn't have shroud. | SpellDescription$ Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/autumn_willow.jpg
+Oracle:Shroud (This creature can't be the target of spells or abilities.)\n{G}: Until end of turn, Autumn Willow can be the target of spells and abilities controlled by target player as though it didn't have shroud.