diff --git a/ChangeLog b/ChangeLog
index 00eefa44ae..1f4094ee74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2014-06-13  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/s390/Makefile: Moved ...
+	* sysdeps/s390/nptl/Makefile: ... here.
+	* nptl/sysdeps/s390/pthread_spin_init.c: Moved ...
+	* sysdeps/s390/nptl/pthread_spin_init.c: ... here.
+	* nptl/sysdeps/s390/pthread_spin_lock.c: Moved ...
+	* sysdeps/s390/nptl/pthread_spin_lock.c: ... here.
+	* nptl/sysdeps/s390/pthread_spin_trylock.c: Moved ...
+	* sysdeps/s390/nptl/pthread_spin_trylock.c: ... here.
+	* nptl/sysdeps/s390/pthread_spin_unlock.c: Moved ...
+	* sysdeps/s390/nptl/pthread_spin_unlock.c: ... here.
+	* nptl/sysdeps/s390/pthreaddef.h: Moved ...
+	* sysdeps/s390/nptl/pthreaddef.h: ... here.
+	* nptl/sysdeps/s390/tcb-offsets.sym: Moved ...
+	* sysdeps/s390/nptl/tcb-offsets.sym: ... here.
+	* nptl/sysdeps/s390/tls.h: Moved ...
+	* sysdeps/s390/nptl/tls.h: ... here.
+
 	* sysdeps/unix/sysv/linux/s390/arch-fork.h: New file.
 	* nptl/sysdeps/unix/sysv/linux/s390/fork.c: File removed.
 
diff --git a/nptl/sysdeps/s390/Makefile b/sysdeps/s390/nptl/Makefile
similarity index 100%
rename from nptl/sysdeps/s390/Makefile
rename to sysdeps/s390/nptl/Makefile
diff --git a/nptl/sysdeps/s390/pthread_spin_init.c b/sysdeps/s390/nptl/pthread_spin_init.c
similarity index 100%
rename from nptl/sysdeps/s390/pthread_spin_init.c
rename to sysdeps/s390/nptl/pthread_spin_init.c
diff --git a/nptl/sysdeps/s390/pthread_spin_lock.c b/sysdeps/s390/nptl/pthread_spin_lock.c
similarity index 100%
rename from nptl/sysdeps/s390/pthread_spin_lock.c
rename to sysdeps/s390/nptl/pthread_spin_lock.c
diff --git a/nptl/sysdeps/s390/pthread_spin_trylock.c b/sysdeps/s390/nptl/pthread_spin_trylock.c
similarity index 100%
rename from nptl/sysdeps/s390/pthread_spin_trylock.c
rename to sysdeps/s390/nptl/pthread_spin_trylock.c
diff --git a/nptl/sysdeps/s390/pthread_spin_unlock.c b/sysdeps/s390/nptl/pthread_spin_unlock.c
similarity index 100%
rename from nptl/sysdeps/s390/pthread_spin_unlock.c
rename to sysdeps/s390/nptl/pthread_spin_unlock.c
diff --git a/nptl/sysdeps/s390/pthreaddef.h b/sysdeps/s390/nptl/pthreaddef.h
similarity index 100%
rename from nptl/sysdeps/s390/pthreaddef.h
rename to sysdeps/s390/nptl/pthreaddef.h
diff --git a/nptl/sysdeps/s390/tcb-offsets.sym b/sysdeps/s390/nptl/tcb-offsets.sym
similarity index 100%
rename from nptl/sysdeps/s390/tcb-offsets.sym
rename to sysdeps/s390/nptl/tcb-offsets.sym
diff --git a/nptl/sysdeps/s390/tls.h b/sysdeps/s390/nptl/tls.h
similarity index 100%
rename from nptl/sysdeps/s390/tls.h
rename to sysdeps/s390/nptl/tls.h