diff --git a/.gitattributes b/.gitattributes
index f7666bc3153..c494cc9206b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8320,6 +8320,7 @@ res/cardsfolder/zhang_liao_hero_of_hefei.txt -text svneol=native#text/plain
 res/cardsfolder/zhao_zilong_tiger_general.txt -text svneol=native#text/plain
 res/cardsfolder/zhou_yu_chief_commander.txt -text svneol=native#text/plain
 res/cardsfolder/zhuge_jin_wu_strategist.txt -text svneol=native#text/plain
+res/cardsfolder/zirilan_of_the_claw.txt -text svneol=native#text/plain
 res/cardsfolder/zo_zu_the_punisher.txt -text svneol=native#text/plain
 res/cardsfolder/zodiac_dog.txt -text svneol=native#text/plain
 res/cardsfolder/zodiac_dragon.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/eladamris_vineyard.txt b/res/cardsfolder/eladamris_vineyard.txt
index 3d3f2c34884..e707454cc4c 100644
--- a/res/cardsfolder/eladamris_vineyard.txt
+++ b/res/cardsfolder/eladamris_vineyard.txt
@@ -2,7 +2,7 @@ Name:Eladamri's Vineyard
 ManaCost:G
 Types:Enchantment
 Text:no text
-T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ Each | Execute$ TrigMana | TriggerDescription$ At the beginning of each player's precombat main phase, add G G to that player's mana pool.
+T:Mode$ Phase | Phase$ Main1 | ValidPlayer$ Each | TriggerZones$ Battlefield | Execute$ TrigMana | TriggerDescription$ At the beginning of each player's precombat main phase, add G G to that player's mana pool.
 SVar:TrigMana:AB$Mana | Cost$ 0 | Produced$ G | Amount$ 2 | Defined$ TriggeredPlayer
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eladamris_vineyard.jpg
diff --git a/res/cardsfolder/zirilan_of_the_claw.txt b/res/cardsfolder/zirilan_of_the_claw.txt
new file mode 100644
index 00000000000..bbf1fd39b10
--- /dev/null
+++ b/res/cardsfolder/zirilan_of_the_claw.txt
@@ -0,0 +1,13 @@
+Name:Zirilan of the Claw
+ManaCost:3 R R
+Types:Legendary Creature Viashino Shaman
+Text:no text
+PT:3/4
+A:AB$ ChangeZone | Cost$ 1 R R T | Origin$ Library | Destination$ Battlefield | ChangeType$ Dragon | ChangeNum$ 1 | Shuffle$ True | SubAbility$ DBPump | RememberChanged$ True | ForgetOtherRemembered$ True | SpellDescription$ Search your library for a Dragon permanent card and put that card onto the battlefield. Then shuffle your library. That Dragon gains haste until end of turn. Exile it at the beginning of the next end step.
+SVar:DBPump:DB$Pump | Defined$ Remembered | KW$ Haste | SubAbility$ DBDelTrig
+SVar:DBDelTrig:DB$DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigExile
+SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Defined$ Remembered | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/zirilan_of_the_claw.jpg
+End
\ No newline at end of file