diff --git a/ChangeLog b/ChangeLog
index 1f4094ee74..9be82b4c30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-06-13  Roland McGrath  <roland@hack.frob.com>
 
+	* nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Moved ...
+	* sysdeps/s390/nptl/bits/pthreadtypes.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/s390/bits/semaphore.h: Moved ...
+	* sysdeps/s390/nptl/bits/semaphore.h: ... here.
+
 	* nptl/sysdeps/s390/Makefile: Moved ...
 	* sysdeps/s390/nptl/Makefile: ... here.
 	* nptl/sysdeps/s390/pthread_spin_init.c: Moved ...
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h b/sysdeps/s390/nptl/bits/pthreadtypes.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h
rename to sysdeps/s390/nptl/bits/pthreadtypes.h
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/bits/semaphore.h b/sysdeps/s390/nptl/bits/semaphore.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/s390/bits/semaphore.h
rename to sysdeps/s390/nptl/bits/semaphore.h