diff --git a/ChangeLog b/ChangeLog
index 38210961a2..79c68fc4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-06  Roland McGrath  <roland@hack.frob.com>
+
+	* nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Moved ...
+	* sysdeps/sh/nptl/bits/pthreadtypes.h: ... here.
+	* nptl/sysdeps/unix/sysv/linux/sh/bits/semaphore.h: Moved ...
+	* sysdeps/sh/nptl/bits/semaphore.h: ... here.
+
 2014-06-06  Chris Metcalf  <cmetcalf@tilera.com>
 
 	* crypt/crypt-private.h [DOS]: Add some includes taken from the
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h b/sysdeps/sh/nptl/bits/pthreadtypes.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
rename to sysdeps/sh/nptl/bits/pthreadtypes.h
diff --git a/nptl/sysdeps/unix/sysv/linux/sh/bits/semaphore.h b/sysdeps/sh/nptl/bits/semaphore.h
similarity index 100%
rename from nptl/sysdeps/unix/sysv/linux/sh/bits/semaphore.h
rename to sysdeps/sh/nptl/bits/semaphore.h