diff --git a/res/cardsfolder/m/mortal_combat.txt b/res/cardsfolder/m/mortal_combat.txt
index 5c10457d7cc..08b7dea4abc 100644
--- a/res/cardsfolder/m/mortal_combat.txt
+++ b/res/cardsfolder/m/mortal_combat.txt
@@ -1,7 +1,9 @@
 Name:Mortal Combat
 ManaCost:2 B B
 Types:Enchantment
-Text:At the beginning of your upkeep, if twenty or more creature cards are in your graveyard, you win the game.
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | IsPresent$ Creature | PresentZone$ Graveyard | PresentPlayer$ You | PresentCompare$ GE20 | TriggerZones$ Battlefield | Execute$ TrigWin | TriggerDescription$ At the beginning of your upkeep, if twenty or more creature cards are in your graveyard, you win the game.
+SVar:TrigWin:AB$WinsGame | Cost$ 0 | Defined$ You
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mortal_combat.jpg
 SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/71.jpg
diff --git a/src/main/java/forge/Upkeep.java b/src/main/java/forge/Upkeep.java
index dfd421b8428..37d59e1f891 100644
--- a/src/main/java/forge/Upkeep.java
+++ b/src/main/java/forge/Upkeep.java
@@ -117,7 +117,6 @@ public class Upkeep implements java.io.Serializable {
         //Win / Lose
         // Checks for can't win or can't lose happen in Player.altWinConditionMet()
 
-        upkeep_Mortal_Combat();
         upkeep_Near_Death_Experience();
         upkeep_Test_of_Endurance();
         upkeep_Helix_Pinnacle();
@@ -2350,38 +2349,6 @@ public class Upkeep implements java.io.Serializable {
         } // if
     } // upkeep_Felidar_Sovereign
 
-
-    /**
-     * <p>upkeep_Mortal_Combat.</p>
-     */
-    private static void upkeep_Mortal_Combat() {
-        final Player player = AllZone.getPhase().getPlayerTurn();
-
-        CardList list = player.getCardsIn(Zone.Battlefield, "Mortal Combat");
-        CardList grave = player.getCardsIn(Zone.Graveyard);
-        grave = grave.filter(AllZoneUtil.creatures);
-
-        if (0 < list.size() && 20 <= grave.size()) {
-            final Card source = list.get(0);
-            Ability ability = new Ability(source, "0") {
-                @Override
-                public void resolve() {
-                    CardList grave = player.getCardsIn(Zone.Graveyard);
-                    grave = grave.filter(AllZoneUtil.creatures);
-                    if (grave.size() >= 20)
-                        player.altWinBySpellEffect(source.getName());
-                }
-            }; // Ability
-
-            StringBuilder sb = new StringBuilder();
-            sb.append("Mortal Combat - ").append(player).append(" wins the game");
-            ability.setStackDescription(sb.toString());
-
-            AllZone.getStack().addSimultaneousStackEntry(ability);
-
-        } // if
-    } // upkeep_Mortal Combat
-
     /**
      * <p>upkeep_Helix_Pinnacle.</p>
      */