diff --git a/ChangeLog b/ChangeLog
index 4fe5c858e9..4aafcd32c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-26  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/clock_settime.c (SYSDEP_SETTIME): Set
+	retval to -1 on error.
+
 2004-02-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdlib/canonicalize.c (__realpath): Simplify.
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index d57c70e5e1..5d19a09bf8 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -60,7 +60,10 @@ extern int __libc_missing_posix_timers attribute_hidden;
       if (e == EINVAL && clock_id == CLOCK_REALTIME)			      \
 	HANDLE_REALTIME;						      \
       else								      \
-	__set_errno (e);						      \
+	{								      \
+	  __set_errno (e);						      \
+	  retval = -1;							      \
+	}								      \
     }									      \
     break
 #endif