diff --git a/res/card-pictures.txt b/res/card-pictures.txt
index 7860756395a..703dcd51de1 100644
--- a/res/card-pictures.txt
+++ b/res/card-pictures.txt
@@ -38,6 +38,7 @@ snow_covered_mountain.jpg        http://www.wizards.com/global/images/magic/gene
 snow_covered_mountain1.jpg       http://www.wizards.com/global/images/magic/general/snow_covered_mountain.jpg
 snow_covered_mountain2.jpg       http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
 snow_covered_mountain3.jpg       http://www.magickartenmarkt.de/img/cards/Ice_Age/snow_covered_mountain.jpg
+halimar_wavewatch.jpg		http://www.wizards.com/global/images/magic/general/halimar_wavewatch.jpg
 tuktuk_the_explorer.jpg		http://www.wizards.com/global/images/magic/general/tuktuk_the_explorer.jpg
 kazandu_tuskcaller.jpg		http://www.wizards.com/global/images/magic/general/kazandu_tuskcaller.jpg
 hada_spy_patrol.jpg				http://www.wizards.com/global/images/magic/general/hada_spy_patrol.jpg
diff --git a/res/cards.txt b/res/cards.txt
index 832bdb472eb..5aada205e58 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -1,3 +1,11 @@
+Halimar Wavewatch
+1 U
+Creature Merfolk Soldier
+LEVEL 1-4 0/6 LEVEL 5+ 6/6 Islandwalk
+0/3
+Level up:2
+maxLevel:5
+
 Hada Spy Patrol
 1 U
 Creature Human Rogue
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 90de1d412f2..88aa3eef20c 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -10178,6 +10178,39 @@ public class GameActionUtil {
 		}
 	};
 	
+	public static Command Halimar_Wavewatch  = new Command() {
+		private static final long serialVersionUID = 117755207922239944L;
+
+		public void execute()
+		{
+			CardList list = new CardList();
+			list.addAll(AllZone.Human_Play.getCards());
+			list.addAll(AllZone.Computer_Play.getCards());
+			list = list.getName("Halimar_Wavewatch");
+
+			for (Card c:list)
+			{
+				int lcs = c.getCounters(Counters.LEVEL);
+				if ( lcs < 1)
+				{
+					c.setBaseAttack(0);
+					c.setBaseDefense(3);
+				}
+				else if ( lcs >=1 && lcs < 5 )  //levels 1-4
+				{
+					c.setBaseAttack(0);
+					c.setBaseDefense(6);
+				}
+				else
+				{
+					c.setBaseAttack(6);
+					c.setBaseDefense(6);
+					c.addNonStackingIntrinsicKeyword("Islandwalk");
+				}
+			}
+		}
+	};
+	
 	public static Command Student_of_Warfare 		  = new Command() {
 		private static final long serialVersionUID = 2627513737024865169L;
 
@@ -15597,6 +15630,7 @@ public class GameActionUtil {
 		commands.put("Knight_of_Cliffhaven", Knight_of_Cliffhaven);
 		commands.put("Beastbreaker_of_Bala_Ged", Beastbreaker_of_Bala_Ged);
 		commands.put("Hada_Spy_Patrol", Hada_Spy_Patrol);
+		commands.put("Halimar_Wavewatch", Halimar_Wavewatch);
 		commands.put("Soulsurge_Elemental", Soulsurge_Elemental);
 		
 		commands.put("Dauntless_Dourbark", Dauntless_Dourbark);
diff --git a/src/forge/StaticEffects.java b/src/forge/StaticEffects.java
index 46bd3e8b97c..77dfa05fde3 100644
--- a/src/forge/StaticEffects.java
+++ b/src/forge/StaticEffects.java
@@ -63,6 +63,7 @@ public class StaticEffects
 		cardToEffectsList.put("Knight of Cliffhaven", new String[] {"Knight_of_Cliffhaven"});
 		cardToEffectsList.put("Beastbreaker of Bala Ged", new String[] {"Beastbreaker_of_Bala_Ged"});
 		cardToEffectsList.put("Hada Spy Patrol", new String[] {"Hada_Spy_Patrol"});
+		cardToEffectsList.put("Halimar_Wavewatch", new String[] {"Halimar Wavewatch"});
 		
 		cardToEffectsList.put("Soulsurge Elemental", new String[] {"Soulsurge_Elemental"});
 		cardToEffectsList.put("Dauntless Dourbark", new String[] {"Dauntless_Dourbark"});