diff --git a/.gitattributes b/.gitattributes
index 13584e5685f..8120bd928e1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3345,6 +3345,7 @@ res/cardsfolder/g/geothermal_crevice.txt svneol=native#text/plain
 res/cardsfolder/g/geralfs_messenger.txt -text
 res/cardsfolder/g/geralfs_mindcrusher.txt -text
 res/cardsfolder/g/gerrard__capashen.txt -text svneol=unset#text/plain
+res/cardsfolder/g/gerrard_capashen.txt -text
 res/cardsfolder/g/gerrards_battle_cry.txt svneol=native#text/plain
 res/cardsfolder/g/gerrards_command.txt svneol=native#text/plain
 res/cardsfolder/g/gerrards_irregulars.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/gerrard_capashen.txt b/res/cardsfolder/g/gerrard_capashen.txt
new file mode 100644
index 00000000000..7ff8c8acc65
--- /dev/null
+++ b/res/cardsfolder/g/gerrard_capashen.txt
@@ -0,0 +1,14 @@
+Name:Gerrard Capashen
+ManaCost:3 W W
+Types:Legendary Creature Human Soldier
+Text:no text
+PT:3/4
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you gain 1 life for each card in target opponent's hand.
+SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | LifeAmount$ X | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Defined$ You
+A:AB$ Tap | Cost$ 3 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | IsPresent$ Card.Self+attacking | SpellDescription$ Tap target creature. Activate this ability only if CARDNAME is attacking.
+SVar:X:TargetedPlayer$CardsInHand
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gerrard_capashen.jpg
+SetInfo:APC|Rare|http://magiccards.info/scans/en/ap/11.jpg
+Oracle:At the beginning of your upkeep, you gain 1 life for each card in target opponent's hand.\n{3}{W}: Tap target creature. Activate this ability only if Gerrard Capashen is attacking.
+End
\ No newline at end of file