diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index cc9b8b24bbe..9ee9bb5ea5c 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -6157,7 +6157,9 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
     }
 
     public void onCleanupPhase(final Player turn) {
-        setDamage(0);
+        if (!this.hasKeyword("Damage isn't removed from CARDNAME during cleanup steps.")) {
+            setDamage(0);
+        }
         setHasBeenDealtDeathtouchDamage(false);
         resetReceivedDamageFromThisTurn();
         setRegeneratedThisTurn(0);
diff --git a/forge-gui/res/cardsfolder/upcoming/patient_zero.txt b/forge-gui/res/cardsfolder/upcoming/patient_zero.txt
new file mode 100644
index 00000000000..122825b2c3c
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/patient_zero.txt
@@ -0,0 +1,8 @@
+Name:Patient Zero
+ManaCost:1 B
+Types:Creature Zombie
+PT:2/2
+K:Lifelink
+S:Mode$ Continuous | Affected$ Creature.OppCtrl | AddHiddenKeyword$ Damage isn't removed from CARDNAME during cleanup steps. | Description$ Damage isn't removed from creatures your opponents control during cleanup steps.
+DeckHas:Ability$LifeGain
+Oracle:Lifelink\nDamage isn't removed from creatures your opponents control during cleanup steps.