diff --git a/ChangeLog b/ChangeLog
index b84d7097d6..6cd6c6873e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2014-09-12  Joseph Myers  <joseph@codesourcery.com>
 
+	* nptl/shlib-versions: Remove architecture-specific entries.
+	Moved to files in sysdeps.
+	* shlib-versions: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions: New
+	file.
+	* sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions: Likewise.
+	* sysdeps/unix/sysv/linux/sh/shlib-versions: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions: Likewise.
+
 	* sysdeps/gnu/netinet/udp.h (UDP_NO_CHECK6_TX): New macro.
 	(UDP_NO_CHECK6_RX): Likewise.
 
diff --git a/nptl/shlib-versions b/nptl/shlib-versions
index f6b9b9ae66..f2cc32d235 100644
--- a/nptl/shlib-versions
+++ b/nptl/shlib-versions
@@ -1,6 +1 @@
-sparc64.*-.*-linux.*	libpthread=0		GLIBC_2.2
-sh.*-.*-linux.*		libpthread=0		GLIBC_2.2
-s390x-.*-linux.*	libpthread=0		GLIBC_2.2
-powerpc64-.*-linux.*	libpthread=0		GLIBC_2.3
-powerpc.*le-.*-linux.*	libpthread=0		GLIBC_2.17
 .*-.*-linux.*		libpthread=0
diff --git a/shlib-versions b/shlib-versions
index 40469bdaae..860fb94133 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -21,23 +21,16 @@
 # Configuration		DEFAULT			Earliest symbol set
 # -------------		---------------		------------------------------
 
-s390x-.*-linux.*        DEFAULT			GLIBC_2.2
-powerpc64-.*-linux.*	DEFAULT			GLIBC_2.3
-powerpc.*le-.*-linux.*	DEFAULT			GLIBC_2.17
 .*-.*-gnu-gnu.*		DEFAULT			GLIBC_2.2.6
 
 # Configuration		Library=version		Earliest symbol set (optional)
 # -------------		---------------		------------------------------
 
 # The interface to -lm depends mostly only on cpu, not on operating system.
-sparc64.*-.*-linux.*	libm=6			GLIBC_2.2
-sh.*-.*-linux.*		libm=6			GLIBC_2.2
 .*-.*-linux.*		libm=6
 .*-.*-gnu-gnu.*		libm=6
 
 # We provide libc.so.6 for Linux kernel versions 2.0 and later.
-sh.*-.*-linux.*		libc=6			GLIBC_2.2
-sparc64.*-.*-linux.*	libc=6			GLIBC_2.2
 .*-.*-linux.*		libc=6
 
 # libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
@@ -49,10 +42,6 @@ sparc64.*-.*-linux.*	libc=6			GLIBC_2.2
 # libc.so.0.3 is the first Hurd libc using libio.
 .*-.*-gnu-gnu.*		libc=0.3
 
-# The dynamic loader also requires different names.
-sparc64.*-.*-linux.*	ld=ld-linux.so.2	GLIBC_2.2
-sparc.*-.*-linux.*	ld=ld-linux.so.2
-sh.*-.*-linux.*		ld=ld-linux.so.2	GLIBC_2.2
 # We use the ELF ABI standard name for the default.
 .*-.*-.*		ld=ld.so.1
 
@@ -90,8 +79,6 @@ sh.*-.*-linux.*		ld=ld-linux.so.2	GLIBC_2.2
 .*-.*-.*		libcrypt=1
 
 # The gross patch for programs assuming broken locale implementations.
-sh.*-.*-.*		libBrokenLocale=1	GLIBC_2.2
-sparc64.*-.*-.*		libBrokenLocale=1	GLIBC_2.2
 .*-.*-.*		libBrokenLocale=1
 
 # The real-time library from POSIX.1b.
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
new file mode 100644
index 0000000000..f6480238c5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/shlib-versions
@@ -0,0 +1,4 @@
+powerpc64-.*-linux.*	DEFAULT			GLIBC_2.3
+powerpc.*le-.*-linux.*	DEFAULT			GLIBC_2.17
+powerpc64-.*-linux.*	libpthread=0		GLIBC_2.3
+powerpc.*le-.*-linux.*	libpthread=0		GLIBC_2.17
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions b/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions
new file mode 100644
index 0000000000..cab0c0b2fa
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/shlib-versions
@@ -0,0 +1,2 @@
+s390x-.*-linux.*        DEFAULT			GLIBC_2.2
+s390x-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/unix/sysv/linux/sh/shlib-versions b/sysdeps/unix/sysv/linux/sh/shlib-versions
new file mode 100644
index 0000000000..c376fe8011
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sh/shlib-versions
@@ -0,0 +1,5 @@
+sh.*-.*-linux.*		libm=6			GLIBC_2.2
+sh.*-.*-linux.*		libc=6			GLIBC_2.2
+sh.*-.*-linux.*		ld=ld-linux.so.2	GLIBC_2.2
+sh.*-.*-.*		libBrokenLocale=1	GLIBC_2.2
+sh.*-.*-linux.*		libpthread=0		GLIBC_2.2
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions b/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions
new file mode 100644
index 0000000000..26ca1f4858
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/shlib-versions
@@ -0,0 +1 @@
+sparc.*-.*-linux.*	ld=ld-linux.so.2
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions b/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions
new file mode 100644
index 0000000000..58d2c241ed
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/shlib-versions
@@ -0,0 +1,5 @@
+sparc64.*-.*-linux.*	libm=6			GLIBC_2.2
+sparc64.*-.*-linux.*	libc=6			GLIBC_2.2
+sparc64.*-.*-linux.*	ld=ld-linux.so.2	GLIBC_2.2
+sparc64.*-.*-.*		libBrokenLocale=1	GLIBC_2.2
+sparc64.*-.*-linux.*	libpthread=0		GLIBC_2.2