diff --git a/.gitattributes b/.gitattributes
index 643ef527c83..42c0d447cc5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1097,6 +1097,7 @@ res/cardsfolder/eland_umbra.txt -text svneol=native#text/plain
 res/cardsfolder/eldrazi_conscription.txt -text svneol=native#text/plain
 res/cardsfolder/eldrazi_monument.txt -text svneol=native#text/plain
 res/cardsfolder/elephant_ambush.txt -text svneol=native#text/plain
+res/cardsfolder/elephant_graveyard.txt -text svneol=native#text/plain
 res/cardsfolder/elf_replica.txt -text svneol=native#text/plain
 res/cardsfolder/elfhame_palace.txt -text svneol=native#text/plain
 res/cardsfolder/elite_cat_warrior.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/elephant_graveyard.txt b/res/cardsfolder/elephant_graveyard.txt
new file mode 100644
index 00000000000..a599a9a9aca
--- /dev/null
+++ b/res/cardsfolder/elephant_graveyard.txt
@@ -0,0 +1,8 @@
+Name:Elephant Graveyard
+ManaCost:no cost
+Types:Land
+Text:no text
+K:tap: add 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_graveyard.jpg
+End
diff --git a/src/forge/CardFactory_Lands.java b/src/forge/CardFactory_Lands.java
index 9c54db1ad37..d7949ecc03b 100644
--- a/src/forge/CardFactory_Lands.java
+++ b/src/forge/CardFactory_Lands.java
@@ -3722,7 +3722,56 @@ class CardFactory_Lands {
         	
         	skipTurn.setBeforePayMana(new Input_PayManaCost(skipTurn));
         }//*************** END ************ END **************************
+        
+        //*************** START ********** START *************************
+        else if(cardName.equals("Elephant Graveyard")) {
+        	final Card[] tgt = new Card[1];
+        	final Command untilEOT = new Command() {
+				private static final long serialVersionUID = -5392534004045270599L;
 
+				public void execute() {
+        			tgt[0].setShield(0);                    
+        		}
+        	};
+
+        	final SpellAbility ability = new Ability_Activated(card, "0") {
+				private static final long serialVersionUID = -3783236452506062253L;
+
+				@Override
+        		public void resolve() {
+        			tgt[0] = this.getTargetCard();
+
+        			tgt[0].addShield();
+        			AllZone.EndOfTurn.addUntil(untilEOT);
+        		}
+
+        		@Override
+        		public boolean canPlayAI() {
+        			return false;
+        		}
+
+        		@Override
+        		public boolean canPlay() {
+        			CardList elephants = AllZoneUtil.getTypeInPlay("Elephant");
+        			return elephants.size() != 0;
+        		}
+        	};
+
+        	ability.setDescription("tap: Regenerate target Elephant.");
+
+        	Target target = new Target("TgtV");
+        	target.setVTSelection("Select target Elephant.");
+        	final String Tgts[] = {"Creature.Elephant"};
+        	target.setValidTgts(Tgts);
+
+        	ability.setTarget(target);
+
+        	final Ability_Cost cost = new Ability_Cost("T", card.getName(), true);
+        	ability.setPayCosts(cost);
+
+        	card.addSpellAbility(ability);
+        }//*************** END ************ END **************************
+        
         if(hasKeyword(card, "Cycling") != -1) {
             int n = hasKeyword(card, "Cycling");
             if(n != -1) {