diff --git a/ChangeLog b/ChangeLog
index e0ee4faab9..8a1704a438 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2003-01-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/alpha/sysdep.h (INLINE_SYSCALL): Undefined before
+	defining.
+
+2003-01-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* sysdeps/s390/s390-64/initfini.c: Avoid unterminated string literals.
+	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (L): Don't define it
+	here.
+	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (L): Likewise.
+
+2003-01-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>
+
+	* sysdeps/s390/s390-32/sysdep.h (JUMPTARGET): Move branch instructions
+	from here...
+	(PSEUDO): ... to here.
+	* sysdeps/s390/s390-64/sysdep.h (JUMPTARGET): Move branch instruction
+	from here...
+	(PSEUDO): ... to here.
+
 2003-01-13  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/programs/charmap-dir.c (charmap_readdir): Use struct
@@ -29,7 +50,7 @@
 
 2003-01-12  Ulrich Drepper  <drepper@redhat.com>
 
-	* elf/dl-close.c (_dl_close): Type typo, must be == not = in
+	* elf/dl-close.c (_dl_close): Fix typo, must be == not = in
 	search for removed searchlist.  Reported by Roland McGrath.
 
 	* io/ftwtest-sh: Add test for case of symlink to nonexisting file
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index fbc327d2b6..7a2f5965a9 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ia64/vfork.S (JUMPTARGET): Remove.
+
 2003-01-13  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c: Avoid
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/ia64/vfork.S b/linuxthreads/sysdeps/unix/sysv/linux/ia64/vfork.S
index 78c26228f7..172ac2b040 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/ia64/vfork.S
+++ b/linuxthreads/sysdeps/unix/sysv/linux/ia64/vfork.S
@@ -21,8 +21,6 @@
 #define _SIGNAL_H
 #include <bits/signum.h>
 
-#define JUMPTARGET(name) name
-
 /* The following are defined in linux/sched.h, which unfortunately	*/
 /* is not safe for inclusion in an assembly file.			*/
 #define CLONE_VM        0x00000100      /* set if VM shared between processes */
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2b70a747e3..20e4c7ac35 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-13  Jakub Jelinek  <jakub@redhat.com>
+
+	* pthread_mutex_lock.c (__pthread_mutex_lock_internal): Make
+	the alias unconditional.
+	* pthread_mutex_unlock.c  (__pthread_mutex_unlock_internal): Likewise.
+
+2003-01-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makefile (CFLAGS-pthread_self.c): New definition.
+
 2003-01-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/pthread/pthread_sigmask.c (pthread_sigmask): Add
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index 47d5f76833..01e7de0d06 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -129,6 +129,7 @@ $syscall_error:					\
 /* ??? Linux needs to be able to override INLINE_SYSCALL for one
    particular special case.  Make this easy.  */
 
+#undef INLINE_SYSCALL
 #define INLINE_SYSCALL(name, nr, args...) \
 	INLINE_SYSCALL1(name, nr, args)