diff --git a/.gitattributes b/.gitattributes
index 7ca383aadaf..9edec6c28f0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -191,6 +191,7 @@ res/cardsfolder/a/allay.txt svneol=native#text/plain
 res/cardsfolder/a/alley_grifters.txt svneol=native#text/plain
 res/cardsfolder/a/allied_strategies.txt svneol=native#text/plain
 res/cardsfolder/a/allosaurus_rider.txt svneol=native#text/plain
+res/cardsfolder/a/alloy_golem.txt -text
 res/cardsfolder/a/alloy_myr.txt svneol=native#text/plain
 res/cardsfolder/a/alluring_scent.txt svneol=native#text/plain
 res/cardsfolder/a/alluring_siren.txt svneol=native#text/plain
diff --git a/res/cardsfolder/a/alloy_golem.txt b/res/cardsfolder/a/alloy_golem.txt
new file mode 100644
index 00000000000..fa275bfdb16
--- /dev/null
+++ b/res/cardsfolder/a/alloy_golem.txt
@@ -0,0 +1,13 @@
+Name:Alloy Golem
+ManaCost:6
+Types:Artifact Creature Golem
+Text:no text
+PT:4/4
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You
+S:Mode$ Continuous| Affected$ Card.Self | SetColor$ ChosenColor | Description$ CARDNAME is the chosen color. (It's still an artifact.)
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/alloy_golem.jpg
+SetInfo:INV|Uncommon|http://magiccards.info/scans/en/in/297.jpg
+Oracle:As Alloy Golem enters the battlefield, choose a color.\nAlloy Golem is the chosen color. (It's still an artifact.)
+End
\ No newline at end of file