diff --git a/.gitattributes b/.gitattributes
index eb653e03089..d28ed594b7a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1220,6 +1220,7 @@ res/cardsfolder/b/boreal_druid.txt svneol=native#text/plain
 res/cardsfolder/b/boreal_griffin.txt svneol=native#text/plain
 res/cardsfolder/b/boreal_shelf.txt svneol=native#text/plain
 res/cardsfolder/b/boris_devilboon.txt svneol=native#text/plain
+res/cardsfolder/b/boros_battleshaper.txt -text
 res/cardsfolder/b/boros_charm.txt -text
 res/cardsfolder/b/boros_cluestone.txt -text
 res/cardsfolder/b/boros_elite.txt -text
diff --git a/res/cardsfolder/b/boros_battleshaper.txt b/res/cardsfolder/b/boros_battleshaper.txt
new file mode 100644
index 00000000000..e11fd39e8f7
--- /dev/null
+++ b/res/cardsfolder/b/boros_battleshaper.txt
@@ -0,0 +1,11 @@
+Name:Boros Battleshaper
+ManaCost:5 R W
+Types:Creature Minotaur Soldier
+PT:5/5
+T:Mode$ Phase | Phase$ BeginCombat | TriggerZones$ Battlefield | Execute$ BattleshapeIncite | TriggerDescription$ At the beginning of each combat, up to one target creature attacks or blocks this combat if able and up to one target creature can't attack or block this combat.
+SVar:BattleshapeIncite:AB$ Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature to make attack or block | TargetMin$ 0 | TargetMax$ 1 | KW$ HIDDEN CARDNAME attacks each turn if able. & HIDDEN CARDNAME blocks each turn if able. | UntilEndOfCombat$ True | SubAbility$ BattleshapeIntimidate
+SVar:BattleshapeIntimidate:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature to prevent from attacking or blocking | TargetMin$ 0 | TargetMax$ 1 | KW$ HIDDEN CARDNAME can't attack or block. | UntilEndOfCombat$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_battleshaper.jpg
+Oracle:At the beginning of each combat, up to one target creature attacks or blocks this combat if able and up to one target creature can't attack or block this combat.
+SetInfo:DGM Rare
\ No newline at end of file