diff --git a/ChangeLog b/ChangeLog
index 9a65bb4..27c400f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 14 23:48:17 PDT 2005 William Brack <wbrack@mmm.com.hk>
+
+	* xpath.c: Changed the behaviour of xmlXPathEqualNodeSetFloat to
+	  return TRUE if a nodeset with a numeric value of NaN is compared
+	  for inequality with any numeric value (bug 309914).
+	  
 Thu Jul 14 01:03:03 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* error.c relaxng.c xmlreader.c xmlschemas.c include/libxml/relaxng.h
diff --git a/xpath.c b/xpath.c
index cd4f82f..0029734 100644
--- a/xpath.c
+++ b/xpath.c
@@ -4577,6 +4577,9 @@
 			ret = 1;
 			break;
 		    }
+		} else {	/* NaN is unequal to any value */
+		    if (neq)
+			ret = 1;
 		}
 	    }
 	}