diff --git a/ChangeLog b/ChangeLog
index ce57b65f14..ec7617ddfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-04-10  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/unix/sysv/linux/x86/Implies: New file.
+	* sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h: Move to ...
+	* sysdeps/alpha/nptl/bits/pthreadtypes.h: ... here.
+	* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Move to ...
+	* sysdeps/powerpc/nptl/bits/pthreadtypes.h: ... here.
+	* sysdeps/x86/bits/pthreadtypes.h: Move to ...
+	* sysdeps/x86/nptl/bits/pthreadtypes.h: ... here.
+
 2017-04-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/dl-procinfo.c: Include
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h b/sysdeps/alpha/nptl/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h
rename to sysdeps/alpha/nptl/bits/pthreadtypes.h
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h b/sysdeps/powerpc/nptl/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h
rename to sysdeps/powerpc/nptl/bits/pthreadtypes.h
diff --git a/sysdeps/unix/sysv/linux/x86/Implies b/sysdeps/unix/sysv/linux/x86/Implies
new file mode 100644
index 0000000000..e454b288aa
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86/Implies
@@ -0,0 +1 @@
+x86/nptl
diff --git a/sysdeps/x86/bits/pthreadtypes.h b/sysdeps/x86/nptl/bits/pthreadtypes.h
similarity index 100%
rename from sysdeps/x86/bits/pthreadtypes.h
rename to sysdeps/x86/nptl/bits/pthreadtypes.h