diff --git a/ChangeLog b/ChangeLog
index 00ec632130..9934037d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/stdio.h: Add declarations for __builtin_fwrite and
+	__builtin_fwrite_unlocked.
+
 2003-08-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/opendir.c (__opendir): Make sure even struct dirent64
diff --git a/include/stdio.h b/include/stdio.h
index c46c7cd5f6..86eeb1ec36 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -110,6 +110,17 @@ libc_hidden_proto (fputs_unlocked)
 libc_hidden_proto (open_memstream)
 libc_hidden_proto (__libc_fatal)
 
+#  if !defined NOT_IN_libc && defined SHARED && defined DO_VERSIONING \
+  && defined HAVE_VISIBILITY_ATTRIBUTE && !defined HAVE_BROKEN_ALIAS_ATTRIBUTE\
+  && !defined NO_HIDDEN
+/* Special gcc builtins.  */
+extern size_t __builtin_fwrite (const void *, size_t, size_t, void *)
+     __asm ("__GI_fwrite");
+extern size_t __builtin_fwrite_unlocked (const void *, size_t, size_t, void *)
+     __asm ("__GI_fwrite_unlocked");
+
+#  endif
+
 # endif
 
 #endif
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 148bc73afb..df07ad11d3 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/pthread.h: Don't mark pthread_exit,
+	pthread_join, pthread_cond_wait, and pthread_cond_timedwait with
+	__THROW to match NPTL.
+
 2003-08-13  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/Makefile [subdir=rt] (CPPFLAGS): Add
diff --git a/linuxthreads/sysdeps/pthread/pthread.h b/linuxthreads/sysdeps/pthread/pthread.h
index 67cef05679..f6cc89950d 100644
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -172,13 +172,12 @@ extern pthread_t pthread_self (void) __THROW;
 extern int pthread_equal (pthread_t __thread1, pthread_t __thread2) __THROW;
 
 /* Terminate calling thread.  */
-extern void pthread_exit (void *__retval)
-     __THROW __attribute__ ((__noreturn__));
+extern void pthread_exit (void *__retval) __attribute__ ((__noreturn__));
 
 /* Make calling thread wait for termination of the thread TH.  The
    exit status of the thread is stored in *THREAD_RETURN, if THREAD_RETURN
    is not NULL.  */
-extern int pthread_join (pthread_t __th, void **__thread_return) __THROW;
+extern int pthread_join (pthread_t __th, void **__thread_return);
 
 /* Indicate that the thread TH is never to be joined with PTHREAD_JOIN.
    The resources of TH will therefore be freed immediately when it
@@ -403,7 +402,7 @@ extern int pthread_cond_broadcast (pthread_cond_t *__cond) __THROW;
 /* Wait for condition variable COND to be signaled or broadcast.
    MUTEX is assumed to be locked before.  */
 extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
-			      pthread_mutex_t *__restrict __mutex) __THROW;
+			      pthread_mutex_t *__restrict __mutex);
 
 /* Wait for condition variable COND to be signaled or broadcast until
    ABSTIME.  MUTEX is assumed to be locked before.  ABSTIME is an
@@ -412,7 +411,7 @@ extern int pthread_cond_wait (pthread_cond_t *__restrict __cond,
 extern int pthread_cond_timedwait (pthread_cond_t *__restrict __cond,
 				   pthread_mutex_t *__restrict __mutex,
 				   __const struct timespec *__restrict
-				   __abstime) __THROW;
+				   __abstime);
 
 /* Functions for handling condition variable attributes.  */