diff --git a/.gitattributes b/.gitattributes
index cc32bb2273b..51dc937adeb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4233,6 +4233,7 @@ res/cardsfolder/k/kitsune_diviner.txt svneol=native#text/plain
 res/cardsfolder/k/kitsune_healer.txt -text
 res/cardsfolder/k/kitsune_loreweaver.txt svneol=native#text/plain
 res/cardsfolder/k/kitsune_riftwalker.txt svneol=native#text/plain
+res/cardsfolder/k/kiyomaro_first_to_stand.txt -text
 res/cardsfolder/k/kjeldoran_dead.txt svneol=native#text/plain
 res/cardsfolder/k/kjeldoran_frostbeast.txt -text
 res/cardsfolder/k/kjeldoran_gargoyle.txt svneol=native#text/plain
diff --git a/res/cardsfolder/k/kiyomaro_first_to_stand.txt b/res/cardsfolder/k/kiyomaro_first_to_stand.txt
new file mode 100644
index 00000000000..6b1e5b1525a
--- /dev/null
+++ b/res/cardsfolder/k/kiyomaro_first_to_stand.txt
@@ -0,0 +1,13 @@
+Name:Kiyomaro, First to Stand
+ManaCost:3 W W
+Types:Legendary Creature Spirit
+Text:no text
+PT:*/*
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to the number of cards in your hand.
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Vigilance | CheckSVar$ X | SVarCompare$ GE4 | Description$ As long as you have four or more cards in hand, CARDNAME has vigilance.
+T:Mode$ DamageDone | ValidSource$ Card.Self | CheckSVar$ X | SVarCompare$ GE7 | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME deals damage, if you have seven or more cards in hand, you gain 7 life.
+SVar:TrigGain:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 7
+SVar:X:Count$InYourHand
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kiyomaro_first_to_stand.jpg
+End
\ No newline at end of file