diff --git a/.gitattributes b/.gitattributes
index 1749d0ca7d4..49c599c3ef7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2931,6 +2931,7 @@ res/cardsfolder/juvenile_gloomwidow.txt -text svneol=native#text/plain
 res/cardsfolder/juzam_djinn.txt -text svneol=native#text/plain
 res/cardsfolder/jwar_isle_refuge.txt -text svneol=native#text/plain
 res/cardsfolder/jwari_scuttler.txt -text svneol=native#text/plain
+res/cardsfolder/jwari_shapeshifter.txt -text svneol=native#text/plain
 res/cardsfolder/kabira_crossroads.txt -text svneol=native#text/plain
 res/cardsfolder/kabira_vindicator.txt svneol=native#text/plain
 res/cardsfolder/kabuto_moth.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/jwari_shapeshifter.txt b/res/cardsfolder/jwari_shapeshifter.txt
new file mode 100644
index 00000000000..692c4a172f4
--- /dev/null
+++ b/res/cardsfolder/jwari_shapeshifter.txt
@@ -0,0 +1,9 @@
+Name:Jwari Shapeshifter
+ManaCost:1 U
+Types:Creature Shapeshifter Ally
+Text:You may have CARDNAME enter the battlefield as a copy of any Ally creature on the battlefield.
+PT:0/0
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jwari_shapeshifter.jpg
+End
\ No newline at end of file
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index c222b477547..7090697b461 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -10148,7 +10148,8 @@ public class CardFactory_Creatures {
         
         //*************** START *********** START **************************
         else if(cardName.equals("Clone") || cardName.equals("Vesuvan Doppelganger") 
-        		|| cardName.equals("Quicksilver Gargantuan")) {
+        		|| cardName.equals("Quicksilver Gargantuan")
+        		|| cardName.equals("Jwari Shapeshifter")) {
         	final CardFactory cfact = cf;
         	final Card[] copyTarget = new Card[1];
         	final Card[] cloned = new Card[1];
@@ -10197,14 +10198,12 @@ public class CardFactory_Creatures {
 						if(cardName.equals("Vesuvan Doppelganger")) {
 							cloned[0].addExtrinsicKeyword("At the beginning of your upkeep, you may have this creature become a copy of target creature except it doesn't copy that creature's color. If you do, this creature gains this ability.");
 							cloned[0].addColor("U", cloned[0], false, true);
-						}
-						
+						}						
 						else if (cardName.equals("Quicksilver Gargantuan")) {
 							cloned[0].setBaseDefense(7);
 							cloned[0].setBaseAttack(7);
 						}
-						PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, card.getController());
-						play.add(cloned[0]);
+						AllZone.GameAction.moveToPlay(cloned[0]);
 						card.setCurrentlyCloningCard(cloned[0]);
 					}
                 }
@@ -10225,6 +10224,10 @@ public class CardFactory_Creatures {
             	@Override
             	public void selectCard(Card c, PlayerZone z) {
             		if( z.is(Constant.Zone.Battlefield) && c.isCreature()) {
+            			if(cardName.equals("Jwari Shapeshifter") && ! c.isType("Ally"))
+            			{
+            				return;
+            			}
             			copyTarget[0] = c;
             			stopSetNext(new Input_PayManaCost(copy));
             		}