diff --git a/.gitattributes b/.gitattributes
index 1ac522681fe..619ff9d1f28 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4411,6 +4411,7 @@ res/cardsfolder/g/goblin_fire_fiend.txt -text
 res/cardsfolder/g/goblin_firebug.txt svneol=native#text/plain
 res/cardsfolder/g/goblin_fireslinger.txt svneol=native#text/plain
 res/cardsfolder/g/goblin_firestarter.txt svneol=native#text/plain
+res/cardsfolder/g/goblin_flectomancer.txt -text
 res/cardsfolder/g/goblin_flotilla.txt -text
 res/cardsfolder/g/goblin_furrier.txt -text
 res/cardsfolder/g/goblin_gardener.txt svneol=native#text/plain
@@ -12540,6 +12541,7 @@ res/cardsfolder/w/wild_nacatl.txt svneol=native#text/plain
 res/cardsfolder/w/wild_ox.txt svneol=native#text/plain
 res/cardsfolder/w/wild_pair.txt -text
 res/cardsfolder/w/wild_research.txt svneol=native#text/plain
+res/cardsfolder/w/wild_ricochet.txt -text
 res/cardsfolder/w/wild_swing.txt -text
 res/cardsfolder/w/wild_wurm.txt svneol=native#text/plain
 res/cardsfolder/w/wilderness_elemental.txt svneol=native#text/plain
diff --git a/res/cardsfolder/g/goblin_flectomancer.txt b/res/cardsfolder/g/goblin_flectomancer.txt
new file mode 100644
index 00000000000..f8395248a3f
--- /dev/null
+++ b/res/cardsfolder/g/goblin_flectomancer.txt
@@ -0,0 +1,8 @@
+Name:Goblin Flectomancer
+ManaCost:U R R
+Types:Creature Goblin Wizard
+PT:2/2
+A:AB$ ChangeTargets | Cost$ Sac<1/CARDNAME> | TargetType$ Spell | ValidTgts$ Instant,Sorcery | TgtPrompt$ Select target instant or sorcery spell | SpellDescription$ You may change the targets of target instant or sorcery spell.
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_flectomancer.jpg
+Oracle:Sacrifice Goblin Flectomancer: You may change the targets of target instant or sorcery spell.
diff --git a/res/cardsfolder/w/wild_ricochet.txt b/res/cardsfolder/w/wild_ricochet.txt
new file mode 100644
index 00000000000..3fbe801049c
--- /dev/null
+++ b/res/cardsfolder/w/wild_ricochet.txt
@@ -0,0 +1,8 @@
+Name:Wild Ricochet
+ManaCost:2 R R
+Types:Instant
+A:SP$ ChangeTargets | Cost$ 2 R R | TargetType$ Spell | Optional$ True | ValidTgts$ Card | SubAbility$ DBCopy | SpellDescription$ You may choose new targets for target instant or sorcery spell. Then copy that spell. You may choose new targets for the copy.
+SVar:DBCopy:DB$ CopySpellAbility | Defined$ Targeted | Controller$ You
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wild_ricochet.jpg
+Oracle:You may choose new targets for target instant or sorcery spell. Then copy that spell. You may choose new targets for the copy.