diff --git a/.gitattributes b/.gitattributes
index 61c20daf487..68fa661fca0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3568,6 +3568,7 @@ res/cardsfolder/g/gush.txt svneol=native#text/plain
 res/cardsfolder/g/gust_skimmer.txt svneol=native#text/plain
 res/cardsfolder/g/gustcloak_harrier.txt -text
 res/cardsfolder/g/gustcloak_runner.txt -text
+res/cardsfolder/g/gustcloak_savior.txt -text svneol=unset#text/plain
 res/cardsfolder/g/gustcloak_skirmisher.txt -text
 res/cardsfolder/g/gustrider_exuberant.txt svneol=native#text/plain
 res/cardsfolder/g/gut_shot.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/gustcloak_savior.txt b/res/cardsfolder/g/gustcloak_savior.txt
new file mode 100644
index 00000000000..6a8ee92addb
--- /dev/null
+++ b/res/cardsfolder/g/gustcloak_savior.txt
@@ -0,0 +1,12 @@
+Name:Gustcloak Savior
+ManaCost:4 W
+Types:Creature Bird Soldier
+Text:no text
+PT:3/4
+K:Flying
+T:Mode$ AttackerBlocked | ValidCard$ Creature.YouCtrl | Execute$ TrigUntapRemove | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever a creature you control becomes blocked, you may untap that creature and remove it from combat.
+SVar:TrigUntapRemove:AB$ Untap | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ DBRemoveCombat
+SVar:DBRemoveCombat:DB$ RemoveFromCombat | Defined$ TriggeredAttacker
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/gustcloak_savior.jpg
+End
\ No newline at end of file