diff --git a/ChangeLog b/ChangeLog
index afe8a3c3e6..91407edd84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-12-31  Ulrich Drepper  <drepper@redhat.com>
 
+	* include/setjmp.h: Add libc_hidden_proto for __libc_longjmp.
+	* sysdeps/generic/longjmp.c: Add libc_hidden_def for __longjmp.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add
+	__GI___longjmp alias.
+
 	* include/setjmp.h: Add libc_hidden_proto for _setjmp.
 	* sysdeps/alpha/setjmp.S: Add __GI__setjmp alias.
 	* sysdeps/arm/bsd-_setjmp.S: Likewise.
diff --git a/include/setjmp.h b/include/setjmp.h
index 0ac6d76dbc..edb2430f81 100644
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -19,6 +19,7 @@ extern void __libc_siglongjmp (sigjmp_buf env, int val)
           __attribute__ ((noreturn));
 extern void __libc_longjmp (sigjmp_buf env, int val)
      __attribute__ ((noreturn));
+libc_hidden_proto (__libc_longjmp)
 
 libc_hidden_proto (_setjmp)
 
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 35ef11fba9..1194982767 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2002-12-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/pthread/pt-initfini.c (call_initialize_minimal): Use
+	__pthread_initialize_minimal_internal not
+	__pthread_initialize_minimal.
+
 2002-12-30  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/pt-initfini.c (call_initialize_minimal): Mark
diff --git a/sysdeps/generic/longjmp.c b/sysdeps/generic/longjmp.c
index fa2aca36c9..9b1bda1caa 100644
--- a/sysdeps/generic/longjmp.c
+++ b/sysdeps/generic/longjmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 95, 97, 98, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,97,98,2000,2002 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
@@ -40,6 +40,7 @@ __libc_siglongjmp (sigjmp_buf env, int val)
 }
 
 strong_alias (__libc_siglongjmp, __libc_longjmp)
+libc_hidden_def (__libc_longjmp)
 weak_alias (__libc_siglongjmp, _longjmp)
 weak_alias (__libc_siglongjmp, longjmp)
 weak_alias (__libc_siglongjmp, siglongjmp)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
index 442a8a010b..df6f81703b 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson (rth@tamu.edu).
 
@@ -46,6 +46,7 @@ END(__libc_siglongjmp)
 
 strong_alias(__libc_siglongjmp, __longjmp)
 strong_alias(__libc_siglongjmp, __libc_longjmp)
+strong_alias(__libc_longjmp, __GI___libc_longjmp)
 weak_alias(__libc_siglongjmp, longjmp)
 weak_alias(__libc_siglongjmp, _longjmp)
 weak_alias(__libc_siglongjmp, siglongjmp)