diff --git a/ChangeLog b/ChangeLog
index 6cd6c6873e..fdbe22feec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-09-12  Joseph Myers  <joseph@codesourcery.com>
 
+	* shlib-versions: Remove OS-specific entries.  Moved to files in
+	sysdeps.
+	* sysdeps/mach/hurd/shlib-versions: New file.
+	* sysdeps/unix/sysv/linux/shlib-versions: Likewise.
+
 	* nptl/shlib-versions: Remove architecture-specific entries.
 	Moved to files in sysdeps.
 	* shlib-versions: Likewise.
diff --git a/shlib-versions b/shlib-versions
index 860fb94133..d34dea8e42 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -1,4 +1,5 @@
-# This file defines the shared library version numbers we will install.
+# This file (and shlib-versions files in sysdeps directories) defines
+# the shared library version numbers we will install.
 
 # The following lines list filename patterns matching canonical configurations,
 # and the associated versions to use for various libraries.  The entire
@@ -17,31 +18,10 @@
 # to apply on matching configurations when the matching entry for a particular
 # library has no third column.  The defaults must precede the entries they
 # apply to.
-#
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-
-.*-.*-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.
-.*-.*-linux.*		libm=6
-.*-.*-gnu-gnu.*		libm=6
-
-# We provide libc.so.6 for Linux kernel versions 2.0 and later.
-.*-.*-linux.*		libc=6
-
-# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
-.*-.*-gnu-gnu.*		libmachuser=1
-
-# libhurduser.so.0.3 corresponds to hurd/*.defs as of 11 June 2002.
-.*-.*-gnu-gnu.*		libhurduser=0.3
-
-# libc.so.0.3 is the first Hurd libc using libio.
-.*-.*-gnu-gnu.*		libc=0.3
-
 # We use the ELF ABI standard name for the default.
 .*-.*-.*		ld=ld.so.1
 
diff --git a/sysdeps/mach/hurd/shlib-versions b/sysdeps/mach/hurd/shlib-versions
new file mode 100644
index 0000000000..f79c6331b5
--- /dev/null
+++ b/sysdeps/mach/hurd/shlib-versions
@@ -0,0 +1,12 @@
+.*-.*-gnu-gnu.*		DEFAULT			GLIBC_2.2.6
+
+.*-.*-gnu-gnu.*		libm=6
+
+# libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
+.*-.*-gnu-gnu.*		libmachuser=1
+
+# libhurduser.so.0.3 corresponds to hurd/*.defs as of 11 June 2002.
+.*-.*-gnu-gnu.*		libhurduser=0.3
+
+# libc.so.0.3 is the first Hurd libc using libio.
+.*-.*-gnu-gnu.*		libc=0.3
diff --git a/sysdeps/unix/sysv/linux/shlib-versions b/sysdeps/unix/sysv/linux/shlib-versions
new file mode 100644
index 0000000000..2c06a8e40c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/shlib-versions
@@ -0,0 +1,2 @@
+.*-.*-linux.*		libm=6
+.*-.*-linux.*		libc=6