diff --git a/src/de/inetsoftware/jwebassembly/watparser/WatParser.java b/src/de/inetsoftware/jwebassembly/watparser/WatParser.java
index 6da894b..1a9bcfb 100644
--- a/src/de/inetsoftware/jwebassembly/watparser/WatParser.java
+++ b/src/de/inetsoftware/jwebassembly/watparser/WatParser.java
@@ -73,6 +73,9 @@ public class WatParser extends WasmCodeBuilder {
                     case "f32.max":
                         addNumericInstruction( NumericOperator.max, ValueType.f32, javaCodePos );
                         break;
+                    case "f64.max":
+                        addNumericInstruction( NumericOperator.max, ValueType.f64, javaCodePos );
+                        break;
                     case "i64.extend_s/i32":
                         addConvertInstruction( ValueTypeConvertion.i2l, javaCodePos );
                         break;
diff --git a/test/de/inetsoftware/jwebassembly/module/WatParserTest.java b/test/de/inetsoftware/jwebassembly/module/WatParserTest.java
index cc6d29a..6be2d0d 100644
--- a/test/de/inetsoftware/jwebassembly/module/WatParserTest.java
+++ b/test/de/inetsoftware/jwebassembly/module/WatParserTest.java
@@ -101,6 +101,16 @@ public class WatParserTest {
         test( "i32.add" );
     }
 
+    @Test
+    public void f32_max() throws IOException {
+        test( "f32.max" );
+    }
+
+    @Test
+    public void f64_max() throws IOException {
+        test( "f64.max" );
+    }
+
     @Test
     public void i32_const() throws IOException {
         test( " i32.const -7 " );