diff --git a/ChangeLog b/ChangeLog
index 5f393c2707..552c31d6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-17  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #1010]
+	* sysdeps/unix/sockatmark.c (sockatmark): Use SIOCATMARK correctly.
+
 	[BZ #1053]
 	* debug/xtrace.sh: Add missing escape character in -? match.
 	Patch by Peter Breitenlohner <peb@mppmu.mpg.de>.
diff --git a/sysdeps/unix/sockatmark.c b/sysdeps/unix/sockatmark.c
index 306ab36ee1..a2476415ac 100644
--- a/sysdeps/unix/sockatmark.c
+++ b/sysdeps/unix/sockatmark.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2005 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
@@ -24,5 +24,7 @@ int
 sockatmark (fd)
      int fd;
 {
-  return __ioctl (fd, SIOCATMARK);
+  int answ;
+
+  return __ioctl (fd, SIOCATMARK, &answ) == -1 ? -1 : answ;
 }