diff --git a/.gitattributes b/.gitattributes
index f97d6c02c47..5bc308b345e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6261,6 +6261,7 @@ res/cardsfolder/l/loaming_shaman.txt -text
 res/cardsfolder/l/lobber_crew.txt -text
 res/cardsfolder/l/lobotomy.txt svneol=native#text/plain
 res/cardsfolder/l/loch_korrigan.txt svneol=native#text/plain
+res/cardsfolder/l/locket_of_yesterdays.txt -text
 res/cardsfolder/l/lockjaw_snapper.txt svneol=native#text/plain
 res/cardsfolder/l/locust_miser.txt svneol=native#text/plain
 res/cardsfolder/l/locust_swarm.txt svneol=native#text/plain
@@ -6485,6 +6486,7 @@ res/cardsfolder/m/mana_prism.txt svneol=native#text/plain
 res/cardsfolder/m/mana_seism.txt -text
 res/cardsfolder/m/mana_severance.txt svneol=native#text/plain
 res/cardsfolder/m/mana_short.txt svneol=native#text/plain
+res/cardsfolder/m/mana_skimmer.txt -text
 res/cardsfolder/m/mana_tithe.txt svneol=native#text/plain
 res/cardsfolder/m/mana_vapors.txt -text
 res/cardsfolder/m/mana_vault.txt svneol=native#text/plain
diff --git a/res/cardsfolder/l/locket_of_yesterdays.txt b/res/cardsfolder/l/locket_of_yesterdays.txt
new file mode 100644
index 00000000000..deb61479e0c
--- /dev/null
+++ b/res/cardsfolder/l/locket_of_yesterdays.txt
@@ -0,0 +1,9 @@
+Name:Locket of Yesterdays
+ManaCost:1
+Types:Artifact
+S:Mode$ ReduceCost | ValidCard$ Card | Type$ Spell | Activator$ You | Amount$ AffectedX | Description$ Spells you cast cost 1 less to cast for each card with the same name as that spell in your graveyard.
+SVar:AffectedX:Count$ValidGraveyard Card.sharesNameWith+YouCtrl
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/locket_of_yesterdays.jpg
+Oracle:Spells you cast cost {1} less to cast for each card with the same name as that spell in your graveyard.
+SetInfo:TSP Uncommon
\ No newline at end of file
diff --git a/res/cardsfolder/m/mana_skimmer.txt b/res/cardsfolder/m/mana_skimmer.txt
new file mode 100644
index 00000000000..a973bbd00e1
--- /dev/null
+++ b/res/cardsfolder/m/mana_skimmer.txt
@@ -0,0 +1,11 @@
+Name:Mana Skimmer
+ManaCost:3 B
+Types:Creature Leech
+PT:2/2
+K:Flying
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TapTarget | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals damage to a player, tap target land that player controls. That land doesn't untap during its controller's next untap step.
+SVar:TapTarget:AB$ Tap | Cost$ 0 | ValidTgts$ Land | TargetsWithDefinedController$ TriggeredTarget | SubAbility$ DBPump
+SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_skimmer.jpg
+Oracle:Flying\nWhenever Mana Skimmer deals damage to a player, tap target land that player controls. That land doesn't untap during its controller's next untap step.
+SetInfo:TSP Common
\ No newline at end of file
diff --git a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
index 468ff7ab41f..de53584967f 100644
--- a/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
+++ b/src/main/java/forge/card/staticability/StaticAbilityCostChange.java
@@ -237,6 +237,8 @@ public class StaticAbilityCostChange {
         int value = 0;
         if ("X".equals(amount)) {
             value = CardFactoryUtil.xCount(hostCard, hostCard.getSVar("X"));
+        } else if ("AffectedX".equals(amount)) {
+            value = CardFactoryUtil.xCount(card, hostCard.getSVar("AffectedX"));
         } else {
             value = Integer.valueOf(amount);
         }