diff --git a/ChangeLog b/ChangeLog
index 304ec0d664..e621545fdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,16 @@
+2002-12-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/fcntl.c (do_fcntl): This is the
+	original __libc_fcntl code.  Just renamed.
+
 2002-12-15  Andreas Schwab  <schwab@suse.de>
 
-	* sysdeps/unix/sysv/linux/m68k/clone.S: Make inline syscall to
-	_exit.
+	* sysdeps/unix/sysv/linux/m68k/clone.S: Make inline syscall to _exit.
 
-2002-12-14  Olaf Hering <olh@suse.de>
+2002-12-14  Olaf Hering  <olh@suse.de>
 
-        * sysdeps/powerpc/bits/setjmp.h: Include <bits/wordsize.h>.
-        * sysdeps/powerpc/powerpc64/setjmp.S: Fix typo in r18 load.
+	* sysdeps/powerpc/bits/setjmp.h: Include <bits/wordsize.h>.
+	* sysdeps/powerpc/powerpc64/setjmp.S: Fix typo in r18 load.
 
 2002-12-15  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index a88297d10b..179e247f2e 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* Versions [libpthread: GLIBC_2.3.2]: Remove creat, poll, pselect,
+	readv, select, sigpause, sigsuspend, sigwaitinfo, waitid, writev.
+	* wrapsyscall.c: Remove creat, poll, pselect, readv, select,
+	sigpause, sigsuspend, sigwaitinfo, waitid, and writev wrappers.
+
 2002-12-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* wrapsyscall.c (CANCELABLE_SYSCALL): Don't define function as
diff --git a/linuxthreads/Versions b/linuxthreads/Versions
index 13d008cd65..78b1a937cf 100644
--- a/linuxthreads/Versions
+++ b/linuxthreads/Versions
@@ -155,10 +155,6 @@ libpthread {
     # Cancellation wrapper
     __nanosleep;
   }
-  GLIBC_2.3.2 {
-    creat; poll; pselect; readv; select; sigpause; sigsuspend;
-    sigwaitinfo; __xpg_sigpause; waitid; writev;
-  }
   GLIBC_PRIVATE {
     # Internal libc interface to libpthread
     __libc_internal_tsd_get; __libc_internal_tsd_set;
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 8529a26dbb..a460d611e5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,7 @@
 2002-12-15  Ulrich Drepper  <drepper@redhat.com>
 
+	* pt-fcntl.c (__fcntl): Use fcntl64 syscall, not fcntl.
+
 	* Versions [libpthread: GLIBC_2.3.2]: Remove creat, poll, pselect,
 	readv, select, sigpause, sigsuspend, sigwaitinfo, waitid, writev.
 	* Makefile (libpthread-routines): Remove pt-creat, pt-poll,
diff --git a/nptl/Versions b/nptl/Versions
index 309a1018eb..488ea2ebe7 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -190,10 +190,6 @@ libpthread {
   }
 
   GLIBC_2.3.2 {
-    # The version for these interfaces is fixed.
-    creat; poll; pselect; readv; select; sigpause; sigsuspend;
-    sigwaitinfo; waitid; writev; __xpg_sigpause;
-
     # Proposed API extensions.
     # XXX Adjust number for final release.
     pthread_tryjoin_np; pthread_timedjoin_np;
diff --git a/nptl/pt-fcntl.c b/nptl/pt-fcntl.c
index 5b55f0b920..7d4a92cea1 100644
--- a/nptl/pt-fcntl.c
+++ b/nptl/pt-fcntl.c
@@ -38,7 +38,7 @@ __fcntl (int fd, int cmd, ...)
   va_start (ap, cmd);
 
 #ifdef INLINE_SYSCALL
-  int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, va_arg (ap, long int));
+  int result = INLINE_SYSCALL (fcntl64, 3, fd, cmd, va_arg (ap, long int));
 #else
   int result = __libc_fcntl (fd, cmd, va_arg (ap, long int));
 #endif
diff --git a/sysdeps/unix/sysv/linux/i386/fcntl.c b/sysdeps/unix/sysv/linux/i386/fcntl.c
index 4ff5ee35b8..bd174fe809 100644
--- a/sysdeps/unix/sysv/linux/i386/fcntl.c
+++ b/sysdeps/unix/sysv/linux/i386/fcntl.c
@@ -35,8 +35,8 @@ extern int __syscall_fcntl64 (int __fd, int __cmd, ...);
 int __have_no_fcntl64;
 
 
-int
-__libc_fcntl (int fd, int cmd, ...)
+static int
+do_fcntl (int fd, int cmd, ...)
 {
 # ifdef __NR_fcntl64
   if (! __have_no_fcntl64)