diff --git a/ChangeLog b/ChangeLog
index e7a20da6d7..6b54fb1537 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-11-10  Roland McGrath  <roland@redhat.com>
 
+	* libio/bug-wfflush.c (do_test): Call rewind instead of fsetpos.
+	Call fputs instead of fwprintf (simpler to follow in debugger).
+
 	* crypt/md5-crypt.c: Doc fix.
 
 	* sysdeps/unix/make-syscalls.sh: Insert $(make-target-directory) at
diff --git a/libio/bug-wfflush.c b/libio/bug-wfflush.c
index 687cdedfad..a8fd61e997 100644
--- a/libio/bug-wfflush.c
+++ b/libio/bug-wfflush.c
@@ -35,13 +35,6 @@ do_test (void)
       return 1;
     }
 
-  fpos_t pos;
-  if (fgetpos (f, &pos) != 0)
-    {
-      printf ("fgetpos: %m\n");
-      return 1;
-    }
-
 #define L_(s) L##s
   //#define fwscanf fscanf
   //#define fwprintf fprintf
@@ -53,15 +46,16 @@ do_test (void)
       return 1;
     }
 
-  if (fsetpos (f, &pos) != 0)
+  rewind (f);
+  if (ferror (f))
     {
-      printf ("fsetpos: %m\n");
+      printf ("rewind: %m\n");
       return 1;
     }
 
-  if (fwprintf (f, L_("1!")) < 2)
+  if (fputws (L_("1!"), f) == EOF)
     {
-      printf ("fwprintf: %m\n");
+      printf ("fputws: %m\n");
       return 1;
     }