diff --git a/extra/CHANGES.txt b/extra/CHANGES.txt
index eebe14b83af..202408619ab 100644
--- a/extra/CHANGES.txt
+++ b/extra/CHANGES.txt
@@ -12,6 +12,7 @@
 	php7 : fixed appending "sqlite:" prefix to the names of files created by `sys.db.Sqlite.open()` (#6692)
 	php7 : made php.Lib.objectOfAssociativeArray() recursive (#6698)
 	php7 : fixed php error on parsing expressions like `a == b == c` (#6720)
+	php7 : fixed `Math.min()` and `Math.max()` for NAN on PHP 7.1.9 and 7.1.10
 	php/php7 : fixed `sys.net.Socket.bind()` (#6693)
 
 2017-10-08: 3.4.4
diff --git a/std/php7/_std/Math.hx b/std/php7/_std/Math.hx
index 73b5e54084a..5694905031d 100644
--- a/std/php7/_std/Math.hx
+++ b/std/php7/_std/Math.hx
@@ -31,8 +31,8 @@ import php.Syntax.*;
 	public static var NEGATIVE_INFINITY(default,null) : Float = -Const.INF;
 
 	public static inline function abs( v:Float ) : Float return Global.abs(v);
-	public static inline function min( a:Float, b:Float ) : Float return isNaN(a) ? NaN : Global.min(a, b);
-	public static inline function max( a:Float, b:Float ) : Float return isNaN(b) ? NaN : Global.max(a, b);
+	public static inline function min( a:Float, b:Float ) : Float return isNaN(a) || isNaN(b) ? NaN : Global.min(a, b);
+	public static inline function max( a:Float, b:Float ) : Float return isNaN(a) || isNaN(b) ? NaN : Global.max(a, b);
 	public static inline function sin( v:Float ) : Float return Global.sin(v);
 	public static inline function cos( v:Float ) : Float return Global.cos(v);
 	public static inline function atan2( y:Float, x:Float ) : Float return Global.atan2(y, x);