diff --git a/Materials/base/landclass-mapping.xml b/Materials/base/landclass-mapping.xml
index d73864f93..17d761484 100644
--- a/Materials/base/landclass-mapping.xml
+++ b/Materials/base/landclass-mapping.xml
@@ -227,48 +227,56 @@
   <description>422 - Salines</description>
   <landclass>38</landclass>
   <material-name>Saline</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>423 - Intertidal flats</description>
   <landclass>39</landclass>
   <material-name>Littoral</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>511 - Water courses</description>
   <landclass>40</landclass>
   <material-name>Watercourse</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>512 - Water bodies</description>
   <landclass>41</landclass>
   <material-name>Lake</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>521 - Coastal lagoons</description>
   <landclass>42</landclass>
   <material-name>Lagoon</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>522 - Estuaries</description>
   <landclass>43</landclass>
   <material-name>Estuary</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>523 - Sea and ocean</description>
   <landclass>44</landclass>
   <material-name>Ocean</material-name>
+  <water>true</water>
 </map>
 
 <map>
   <description>999 - NODATA</description>
   <landclass>48</landclass>
   <material-name>Ocean</material-name>
+  <water>true</water>
 </map>
 
 </PropertyList>
diff --git a/Materials/base/materials-base.xml b/Materials/base/materials-base.xml
index cf1fe4cf4..edda8210c 100644
--- a/Materials/base/materials-base.xml
+++ b/Materials/base/materials-base.xml
@@ -12,7 +12,7 @@
 <PropertyList>
 
 <material n="3000">
-  <name>ws30</name>
+  <name>ws30land</name>
   <effect>Effects/ws30</effect>
   <xsize>2000</xsize>
   <ysize>2000</ysize>
@@ -37,6 +37,11 @@
   <load-resistance>1e30</load-resistance>
 </material>
 
+<material n="3001">
+  <name>ws30water</name>
+  <effect>Effects/ws30water</effect>
+</material>
+
 
 <!-- Signage -->