diff --git a/src/daemon/.cvsignore b/src/daemon/.cvsignore
index 3993abba..63d33eb4 100644
--- a/src/daemon/.cvsignore
+++ b/src/daemon/.cvsignore
@@ -1,6 +1,7 @@
 Makefile.in
 Makefile
 libgtop_daemon
+libgtop_server
 server.conf
 .libs
 .deps
diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog
index 9f68237a..a8334f50 100644
--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,11 @@
+1999-05-07  Martin Baulig  <martin@home-of-linux.org>
+
+	* server.c (main): There's some problem with uname () - some systems
+	like Solaris or Digital Unix return a nonnegative value on success,
+	some others like Linux return 0. Since all known systems seem to return
+	a negative value on failure, we simply check whether the return value is
+	not negative here.
+
 1999-02-19  Martin Baulig  <martin@home-of-linux.org>
 
 	* Makefile.am (LIBGTOP_COMPILE_SYSTEM): Hardcoded system name.
diff --git a/src/daemon/server.c b/src/daemon/server.c
index 8c62f9dc..a4e18476 100644
--- a/src/daemon/server.c
+++ b/src/daemon/server.c
@@ -68,7 +68,7 @@ main(int argc, char *argv[])
 	uid = getuid (); euid = geteuid ();
 	gid = getgid (); egid = getegid ();
 
-	if (uname (&uts)) _exit (1);
+	if (uname (&uts) < 0) _exit (1);
 
 	if (strcmp (uts.sysname, LIBGTOP_COMPILE_SYSTEM) ||
 	    strcmp (uts.release, LIBGTOP_COMPILE_RELEASE) ||