diff --git a/.gitattributes b/.gitattributes
index bf1ae6382a5..05a7f90d79c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1367,6 +1367,7 @@ res/cardsfolder/c/cloak_of_confusion.txt svneol=native#text/plain
 res/cardsfolder/c/cloak_of_feathers.txt svneol=native#text/plain
 res/cardsfolder/c/cloak_of_mists.txt svneol=native#text/plain
 res/cardsfolder/c/clock_of_omens.txt svneol=native#text/plain
+res/cardsfolder/c/clockwork_avian.txt -text
 res/cardsfolder/c/clockwork_beast.txt -text
 res/cardsfolder/c/clockwork_beetle.txt svneol=native#text/plain
 res/cardsfolder/c/clockwork_condor.txt svneol=native#text/plain
diff --git a/res/cardsfolder/c/clockwork_avian.txt b/res/cardsfolder/c/clockwork_avian.txt
new file mode 100644
index 00000000000..6346fbcf9d6
--- /dev/null
+++ b/res/cardsfolder/c/clockwork_avian.txt
@@ -0,0 +1,15 @@
+Name:Clockwork Avian
+ManaCost:5
+Types:Artifact Creature Bird
+Text:no text
+PT:0/4
+K:Flying
+K:etbCounter:P1P0:4
+T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | IsPresent$ Card.attacking+Self,Card.blocking+Self | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At end of combat, if CARDNAME attacked or blocked this combat, remove a +1/+0 counter from it.
+SVar:TrigSubCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P0 | CounterNum$ 1
+A:AB$ PutCounter | Cost$ X T | Defined$ Self | UpTo$ True | MaxFromEffect$ 4 | CounterType$ P1P0 | CounterNum$ X | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Put up to X +1/+0 counters on CARDNAME. This ability can't cause the total number of +1/+0 counters on CARDNAME to be greater than four. Activate this ability only during your upkeep.
+SVar:X:Count$xPaid
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/clockwork_avian.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/c/clockwork_beast.txt b/res/cardsfolder/c/clockwork_beast.txt
index 329a84e9aeb..556718bec01 100644
--- a/res/cardsfolder/c/clockwork_beast.txt
+++ b/res/cardsfolder/c/clockwork_beast.txt
@@ -6,7 +6,7 @@ PT:0/4
 K:etbCounter:P1P0:7
 T:Mode$ Phase | Phase$ EndCombat | ValidPlayer$ Player | IsPresent$ Card.attacking+Self,Card.blocking+Self | TriggerZones$ Battlefield | Execute$ TrigSubCounter | TriggerDescription$ At end of combat, if CARDNAME attacked or blocked this combat, remove a +1/+0 counter from it.
 SVar:TrigSubCounter:AB$ RemoveCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P0 | CounterNum$ 1
-A:AB$ PutCounter | Cost$ X T | Defined$ Self | UpTo$ True | MaxFromEffect$ 7 | CounterType$ P1P0 | CounterNum$ X | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Put up to X +1/+0 counters on Clockwork Beast. This ability can't cause the total number of +1/+0 counters on CARDNAME to be greater than seven. Activate this ability only during your upkeep.
+A:AB$ PutCounter | Cost$ X T | Defined$ Self | UpTo$ True | MaxFromEffect$ 7 | CounterType$ P1P0 | CounterNum$ X | ActivationPhases$ Upkeep | PlayerTurn$ True | SpellDescription$ Put up to X +1/+0 counters on CARDNAME. This ability can't cause the total number of +1/+0 counters on CARDNAME to be greater than seven. Activate this ability only during your upkeep.
 SVar:X:Count$xPaid
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon