diff --git a/.gitattributes b/.gitattributes
index 331b7352417..d319e359415 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6666,6 +6666,7 @@ res/cardsfolder/r/riptide_entrancer.txt svneol=native#text/plain
 res/cardsfolder/r/riptide_laboratory.txt svneol=native#text/plain
 res/cardsfolder/r/riptide_pilferer.txt svneol=native#text/plain
 res/cardsfolder/r/riptide_replicator.txt -text
+res/cardsfolder/r/riptide_shapeshifter.txt -text svneol=unset#text/plain
 res/cardsfolder/r/riptide_survivor.txt svneol=native#text/plain
 res/cardsfolder/r/rise_from_the_grave.txt svneol=native#text/plain
 res/cardsfolder/r/rise_of_the_hobgoblins.txt svneol=native#text/plain
diff --git a/res/cardsfolder/r/riptide_shapeshifter.txt b/res/cardsfolder/r/riptide_shapeshifter.txt
new file mode 100644
index 00000000000..5d9449ede59
--- /dev/null
+++ b/res/cardsfolder/r/riptide_shapeshifter.txt
@@ -0,0 +1,10 @@
+Name:Riptide Shapeshifter
+ManaCost:3 U U
+Types:Creature Shapeshifter
+Text:no text
+PT:3/3
+A:AB$ ChooseType | Cost$ 2 U U Sac<1/CARDNAME> | Type$ Creature | SubAbility$ DBDigUntil | SpellDescription$ Choose a creature type. Reveal cards from the top of your library until you reveal a creature card of that type. Put that card onto the battlefield and shuffle the rest into your library.
+SVar:DBDigUntil:DB$ DigUntil | Valid$ Creature.ChosenType | ValidDescription$ creature card of chosen type | FoundDestination$ Battlefield | RevealedDestination$ Library | Shuffle$ True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/riptide_shapeshifter.jpg
+End
\ No newline at end of file