diff --git a/.gitattributes b/.gitattributes
index 8583e73c2f8..add1da54beb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4129,6 +4129,7 @@ res/cardsfolder/uktabi_orangutan.txt -text svneol=native#text/plain
 res/cardsfolder/ulamog_the_infinite_gyre.txt -text svneol=native#text/plain
 res/cardsfolder/ulamogs_crusher.txt -text svneol=native#text/plain
 res/cardsfolder/umara_raptor.txt -text svneol=native#text/plain
+res/cardsfolder/umbra_stalker.txt -text svneol=native#text/plain
 res/cardsfolder/umbral_mantle.txt -text svneol=native#text/plain
 res/cardsfolder/umezawas_jitte.txt -text svneol=native#text/plain
 res/cardsfolder/unburden.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/umbra_stalker.txt b/res/cardsfolder/umbra_stalker.txt
new file mode 100644
index 00000000000..426695ea245
--- /dev/null
+++ b/res/cardsfolder/umbra_stalker.txt
@@ -0,0 +1,8 @@
+Name:Umbra Stalker
+ManaCost:4 B B B
+Types:Creature Elemental
+Text:Chroma — Umbra Stalker's power and toughness are each equal to the number of black mana symbols in the mana costs of cards in your graveyard.
+PT:1/1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/umbra_stalker.jpg
+End
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index fd236230f0a..a4b0684c407 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -11762,6 +11762,25 @@ public class GameActionUtil {
 			}
 		}// execute()
 	};
+	
+	/**
+	 * stores the Command
+	 */
+	public static Command Umbra_Stalker = new Command() {
+		private static final long serialVersionUID = -3500747003228938898L;
+
+		public void execute() {
+			// get all creatures
+			CardList cards = AllZoneUtil.getCardsInPlay("Umbra Stalker");
+			for(Card c:cards) {
+				String player = c.getController();
+				CardList grave = AllZoneUtil.getPlayerGraveyard(player);
+				int pt = CardFactoryUtil.getNumberOfManaSymbolsByColor("B", grave);
+				c.setBaseAttack(pt);
+				c.setBaseDefense(pt);
+			}
+		}// execute()
+	};
 
 	public static Command Absolute_Grace              = new Command() {
 		private static final long serialVersionUID   = -6904191523315339355L;
@@ -20812,6 +20831,7 @@ public class GameActionUtil {
 		commands.put("Arena_of_the_Ancients", Arena_of_the_Ancients);
 		commands.put("Angry_Mob", Angry_Mob);
 		commands.put("Maraxus_of_Keld", Maraxus_of_Keld);
+		commands.put("Umbra_Stalker", Umbra_Stalker);
 		
 		//System.out.println("size of commands: " + commands.size());
 
diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java
index e205f749a1f..6fd1bdf5050 100644
--- a/src/forge/StaticEffects.java
+++ b/src/forge/StaticEffects.java
@@ -232,6 +232,7 @@ public class StaticEffects
 		cardToEffectsList.put("Arena of the Ancients", new String[] {"Arena_of_the_Ancients"});
 		cardToEffectsList.put("Angry Mob", new String[] {"Angry_Mob"});
 		cardToEffectsList.put("Maraxus of Keld", new String[] {"Maraxus_of_Keld"});
+		cardToEffectsList.put("Umbra Stalker", new String[] {"Umbra_Stalker"});
 	}
 	
 	public HashMap<String, String[]> getCardToEffectsList()