diff --git a/.gitattributes b/.gitattributes
index 3ad89dd1e53..91bccd238fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12045,6 +12045,7 @@ res/cardsfolder/w/whip_spine_drake.txt svneol=native#text/plain
 res/cardsfolder/w/whip_vine.txt svneol=native#text/plain
 res/cardsfolder/w/whipcorder.txt svneol=native#text/plain
 res/cardsfolder/w/whipflare.txt svneol=native#text/plain
+res/cardsfolder/w/whipkeeper.txt -text
 res/cardsfolder/w/whiplash_trap.txt svneol=native#text/plain
 res/cardsfolder/w/whipstitched_zombie.txt svneol=native#text/plain
 res/cardsfolder/w/whiptail_moloch.txt svneol=native#text/plain
diff --git a/res/cardsfolder/w/whipkeeper.txt b/res/cardsfolder/w/whipkeeper.txt
new file mode 100644
index 00000000000..8075cae1f21
--- /dev/null
+++ b/res/cardsfolder/w/whipkeeper.txt
@@ -0,0 +1,9 @@
+Name:Whipkeeper
+ManaCost:2 R R
+Types:Creature Dwarf
+PT:1/1
+A:AB$ DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X | SpellDescription$ CARDNAME deals damage to target creature equal to the damage already dealt to it this turn.
+SVar:X:Targeted$TotalDamageReceivedThisTurn
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/whipkeeper.jpg
+Oracle:{T}: Whipkeeper deals damage to target creature equal to the damage already dealt to it this turn.
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index d4f8fd3e7c8..3c7b330cc7b 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -7675,6 +7675,14 @@ public class Card extends GameEntity implements Comparable<Card> {
         this.receivedDamageFromThisTurn.clear();
     }
 
+    public final int getTotalDamageRecievedThisTurn() {
+        int total = 0;
+        for (int damage : this.receivedDamageFromThisTurn.values()) {
+            total += damage;
+        }
+        return total;
+    }
+
     /**
      * <p>
      * addDealtDamageToThisTurn.
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index af7877e5ca3..981093bb98d 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -1537,6 +1537,10 @@ public class CardFactoryUtil {
             return CardFactoryUtil.doXMath(c.getTotalDamageDoneBy(), m, c);
         }
 
+        if (sq[0].equals("TotalDamageReceivedThisTurn")) {
+            return CardFactoryUtil.doXMath(c.getTotalDamageRecievedThisTurn(), m, c);
+        }
+
         // Count$YourPoisonCounters
         if (sq[0].contains("YourPoisonCounters")) {
             return CardFactoryUtil.doXMath(cardController.getPoisonCounters(), m, c);