diff --git a/.gitattributes b/.gitattributes
index 43c45201047..326b35db49a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -109,6 +109,7 @@ res/cardsfolder/alaborn_musketeer.txt -text svneol=native#text/plain
 res/cardsfolder/alaborn_trooper.txt -text svneol=native#text/plain
 res/cardsfolder/alaborn_veteran.txt -text svneol=native#text/plain
 res/cardsfolder/alaborn_zealot.txt -text svneol=native#text/plain
+res/cardsfolder/aladdin.txt -text svneol=native#text/plain
 res/cardsfolder/aladdins_ring.txt -text svneol=native#text/plain
 res/cardsfolder/albino_troll.txt -text svneol=native#text/plain
 res/cardsfolder/alert_shu_infantry.txt -text svneol=native#text/plain
@@ -5097,6 +5098,7 @@ res/cardsfolder/will_o_the_wisp.txt -text svneol=native#text/plain
 res/cardsfolder/willow_dryad.txt -text svneol=native#text/plain
 res/cardsfolder/willow_elf.txt -text svneol=native#text/plain
 res/cardsfolder/willow_faerie.txt -text svneol=native#text/plain
+res/cardsfolder/willow_satyr.txt -text svneol=native#text/plain
 res/cardsfolder/wilt_leaf_cavaliers.txt -text svneol=native#text/plain
 res/cardsfolder/wilt_leaf_liege.txt -text svneol=native#text/plain
 res/cardsfolder/wind_dancer.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/aladdin.txt b/res/cardsfolder/aladdin.txt
new file mode 100644
index 00000000000..90906ad20a9
--- /dev/null
+++ b/res/cardsfolder/aladdin.txt
@@ -0,0 +1,9 @@
+Name:Aladdin
+ManaCost:2 R R
+Types:Creature Human Rogue
+Text:no text
+PT:1/1
+A:AB$GainControl|Cost$1 R R T|ValidTgts$Artifact|TgtPrompt$Select target artifact.|LoseControl$LeavesPlay,LoseControl|SpellDescription$Gain control of target artifact for as long as you control Aladdin.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aladdin.jpg
+End
diff --git a/res/cardsfolder/willow_satyr.txt b/res/cardsfolder/willow_satyr.txt
new file mode 100644
index 00000000000..d40ef24187d
--- /dev/null
+++ b/res/cardsfolder/willow_satyr.txt
@@ -0,0 +1,10 @@
+Name:Willow Satyr
+ManaCost:2 G G
+Types:Creature Satyr
+Text:no text
+PT:1/1
+K:You may choose not to untap CARDNAME during your untap step.
+A:AB$GainControl|Cost$T|ValidTgts$Creature.Legendary|TgtPrompt$Select target legendary creature.|LoseControl$Untap,LeavesPlay,LoseControl|SpellDescription$Gain control of target legendary creature for as long as you control Willow Satyr and Willow Satyr remains tapped.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/willow_satyr.jpg
+End