diff --git a/.gitattributes b/.gitattributes
index 08ecf7f1fd0..aebd55c8eba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8129,6 +8129,7 @@ res/cardsfolder/whiptail_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/whiptongue_frog.txt -text svneol=native#text/plain
 res/cardsfolder/whirling_catapult.txt svneol=native#text/plain
 res/cardsfolder/whirling_dervish.txt -text svneol=native#text/plain
+res/cardsfolder/whirlpool_drake.txt -text svneol=native#text/plain
 res/cardsfolder/whirlpool_rider.txt -text svneol=native#text/plain
 res/cardsfolder/whirlwind.txt -text svneol=native#text/plain
 res/cardsfolder/whispering_shade.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/whirlpool_drake.txt b/res/cardsfolder/whirlpool_drake.txt
new file mode 100644
index 00000000000..6dc48789c7b
--- /dev/null
+++ b/res/cardsfolder/whirlpool_drake.txt
@@ -0,0 +1,9 @@
+Name:Whirlpool Drake
+ManaCost:3 U
+Types:Creature Drake
+Text:When CARDNAME enters the battlefield, shuffle the cards from your hand into your library, then draw that many cards.\r\n\r\nWhen CARDNAME is put into a graveyard from the battlefield, shuffle the cards from your hand into your library, then draw that many cards.
+PT:2/2
+K:Flying
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/whirlpool_drake.jpg
+End
\ No newline at end of file
diff --git a/src/forge/card/cardFactory/CardFactory_Creatures.java b/src/forge/card/cardFactory/CardFactory_Creatures.java
index 66f1c766018..ebf1ac84825 100644
--- a/src/forge/card/cardFactory/CardFactory_Creatures.java
+++ b/src/forge/card/cardFactory/CardFactory_Creatures.java
@@ -718,7 +718,7 @@ public class CardFactory_Creatures {
         
 
         //*************** START *********** START **************************
-        else if(cardName.equals("Whirlpool Rider")) {
+        else if(cardName.equals("Whirlpool Rider") || cardName.equals("Whirlpool Drake")) {
             final SpellAbility ability = new Ability(card, "0") {
             	
                 @Override
@@ -737,7 +737,7 @@ public class CardFactory_Creatures {
                 }
             };//SpellAbility
             
-            Command intoPlay = new Command() {
+            Command shuffle = new Command() {
                 private static final long serialVersionUID = 6290392806910817877L;
                 
                 public void execute() {
@@ -750,7 +750,8 @@ public class CardFactory_Creatures {
 
                 }
             };
-            card.addComesIntoPlayCommand(intoPlay);
+            card.addComesIntoPlayCommand(shuffle);
+            if(cardName.equals("Whirlpool Drake")) card.addDestroyCommand(shuffle);
         }//*************** END ************ END **************************