diff --git a/res/cardsfolder/p/phyrexian_unlife.txt b/res/cardsfolder/p/phyrexian_unlife.txt
index 708c2deb060..ca591c3dcc6 100644
--- a/res/cardsfolder/p/phyrexian_unlife.txt
+++ b/res/cardsfolder/p/phyrexian_unlife.txt
@@ -3,7 +3,8 @@ ManaCost:2 W
 Types:Enchantment
 Text:no text
 S:Mode$ Continuous | Affected$ You | AddKeyword$ You don't lose the game for having 0 or less life. | Description$ You don't lose the game for having 0 or less life.
-K:As long as you have 0 or less life, all damage is dealt to you as though its source had infect.
+S:Mode$ Continuous | CheckSVar$ UnlifeCondition | SVarCompare$ LE0 | Affected$ You | AddKeyword$ All damage is dealt to you as though its source had infect. | Description$ As long as you have 0 or less life, all damage is dealt to you as though its source had infect.
+SVar:UnlifeCondition:Count$YourLifeTotal
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_unlife.jpg
 SetInfo:NPH|Rare|http://magiccards.info/scans/en/nph/18.jpg
diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java
index 689f80625c4..b4f21dcfba8 100644
--- a/src/main/java/forge/game/player/Player.java
+++ b/src/main/java/forge/game/player/Player.java
@@ -526,19 +526,8 @@ public abstract class Player extends GameEntity {
             return false;
         }
 
-        boolean infect = source.hasKeyword("Infect");
-        final StringBuilder sb = new StringBuilder(
-                "As long as you have 0 or less life, all damage is dealt to you as though its source had infect.");
-
-        if ((this.getLife() <= 0) && !infect) {
-            final CardList cards = this.getCardsIn(ZoneType.Battlefield);
-            for (final Card card : cards) {
-                if (card.hasKeyword(sb.toString())) {
-                    infect = true;
-                    break;
-                }
-            }
-        }
+        boolean infect = source.hasKeyword("Infect") || 
+			this.hasKeyword("All damage is dealt to you as though its source had infect.");
 
         if (infect) {
             this.addPoisonCounters(damageToDo, source);