diff --git a/ChangeLog b/ChangeLog
index 5f0954d17..8c5025f9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-26 Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSProcessInfo.m (determineOperatingSystem):
+	uname() on solaris may return a positive value on success, not just 0
+
 2014-03-25  Fred Kiefer <fredkiefer@gmx.de>
 
 	* Tools/NSOperation.m: ([_finish]) fix logic of 'executing' flag.
diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m
index b3f8b00b7..c5fd6fa8a 100644
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@@ -1,5 +1,5 @@
 /** Implementation for NSProcessInfo for GNUStep
-   Copyright (C) 1995-2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
    Written by:  Georg Tuparev <Tuparev@EMBL-Heidelberg.de>
                 Heidelberg, Germany
@@ -1122,7 +1122,7 @@ static void determineOperatingSystem()
        * That's good if the binary is running on a system other than
        * the one it was built for (rare, but can happen).
        */
-      if (uname(&uts) == 0)
+      if (!(uname(&uts) < 0))
 	{
 	  os = [NSString stringWithCString: uts.sysname                                                           encoding: [NSString defaultCStringEncoding]];
 	  os = [os lowercaseString];