diff --git a/res/cardsfolder/h/harbor_serpent.txt b/res/cardsfolder/h/harbor_serpent.txt
index 9a3480f75a6..b5ffac17ff2 100644
--- a/res/cardsfolder/h/harbor_serpent.txt
+++ b/res/cardsfolder/h/harbor_serpent.txt
@@ -1,9 +1,11 @@
 Name:Harbor Serpent
 ManaCost:4 U U
 Types:Creature Serpent
-Text:Harbor Serpent can't attack unless there are five or more Islands on the battlefield.
+Text:no text
 PT:5/5
 K:Islandwalk
+S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT5 | Description$ CARDNAME can't attack unless there are five or more Islands on the battlefield.
+SVar:X:Count$Valid Island
 SVar:BuffedBy:Island
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/harbor_serpent.jpg
diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java
index cfb174cfe7c..82da898ddb3 100644
--- a/src/main/java/forge/game/phase/CombatUtil.java
+++ b/src/main/java/forge/game/phase/CombatUtil.java
@@ -810,13 +810,6 @@ public class CombatUtil {
             }
         }
 
-        if (c.getName().equals("Harbor Serpent")) {
-            final CardList allislands = AllZoneUtil.getCardsIn(ZoneType.Battlefield).getType("Island");
-            if (allislands.size() < 5) {
-                return false;
-            }
-        }
-
         // The creature won't untap next turn
         if (c.isTapped() && !Untap.canUntap(c)) {
             return false;