diff --git a/ChangeLog b/ChangeLog
index 73f4260ea..c7c4cc2bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* Source/GSSocketStream.m
 	Fix code-path for non AF_INET6
 
+	* Source/NSDate.m
+	Provide NAN constant for Solaris if not available.
+
 2014-11-29  Sergei Golovin <Golovin.SV@gmail.com>
 
 	* Tests/base/NSURLConnection: Test helper tool plus a load of
diff --git a/Source/NSDate.m b/Source/NSDate.m
index 597c9d31c..2ed1aded6 100644
--- a/Source/NSDate.m
+++ b/Source/NSDate.m
@@ -49,6 +49,11 @@
 #define DISTANT_FUTURE	63113990400.0
 #define DISTANT_PAST	-63113817600.0
 
+/* On older Solaris we don't have NAN nor nan() */
+#if defined(__sun) && defined(__SVR4) && !defined(NAN)
+#define NAN 0x7fffffffffffffff
+#endif
+
 const NSTimeInterval NSTimeIntervalSince1970 = 978307200.0;