diff --git a/ChangeLog b/ChangeLog
index c87e5c869f..13a49e54c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/tst-preadwrite.c: Alloc file being used also for testing
+	pread64 and pwrite64.
+	* posix/tst-preadwrite64.c: New file.
+
 2000-05-26  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/unix/sysv/linux/i386/pread64.c: Removed, we can use the
diff --git a/posix/tst-preadwrite.c b/posix/tst-preadwrite.c
index 68379bf036..6a71e4f5d5 100644
--- a/posix/tst-preadwrite.c
+++ b/posix/tst-preadwrite.c
@@ -1,5 +1,5 @@
 /* Tests for pread and pwrite.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,6 +23,15 @@
 #include <unistd.h>
 
 
+/* Allow testing of the 64-bit versions as well.  */
+#ifndef PREAD
+# define PREAD pread
+# define PWRITE pwrite
+#endif
+
+#define STRINGIFY(s) STRINGIFY2 (s)
+#define STRINGIFY2(s) #s
+
 /* Prototype for our test function.  */
 extern void do_prepare (int argc, char *argv[]);
 extern int do_test (int argc, char *argv[]);
@@ -73,16 +82,16 @@ do_test (int argc, char *argv[])
 
   for (i = 100; i < 200; ++i)
     buf[i] = i;
-  if (pwrite (fd, buf + 100, 100, 100) != 100)
-    error (EXIT_FAILURE, errno, "during pwrite");
+  if (PWRITE (fd, buf + 100, 100, 100) != 100)
+    error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
 
   for (i = 450; i < 600; ++i)
     buf[i] = i;
-  if (pwrite (fd, buf + 450, 150, 450) != 150)
-    error (EXIT_FAILURE, errno, "during pwrite");
+  if (PWRITE (fd, buf + 450, 150, 450) != 150)
+    error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PWRITE));
 
-  if (pread (fd, res, sizeof (buf) - 50, 50) != sizeof (buf) - 50)
-    error (EXIT_FAILURE, errno, "during pread");
+  if (PREAD (fd, res, sizeof (buf) - 50, 50) != sizeof (buf) - 50)
+    error (EXIT_FAILURE, errno, "during %s", STRINGIFY (PREAD));
 
   close (fd);
   unlink (name);