diff --git a/sysdeps/hppa/nptl/shlib-versions b/sysdeps/hppa/nptl/shlib-versions
deleted file mode 100644
index adc2636..0000000
--- a/sysdeps/hppa/nptl/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-hppa.*-.*-linux.*      libpthread=0            GLIBC_2.2
diff --git a/sysdeps/hppa/shlib-versions b/sysdeps/hppa/shlib-versions
index 6b9225c..ae3a3f1 100644
--- a/sysdeps/hppa/shlib-versions
+++ b/sysdeps/hppa/shlib-versions
@@ -1,9 +1 @@
-hppa.*-.*-.*		libm=6			GLIBC_2.2
-
-hppa.*-.*-.*		libc=6			GLIBC_2.2
-
-hppa.*-.*-.*		ld=ld.so.1		GLIBC_2.2
-
-hppa-.*-.*		libBrokenLocale=1	GLIBC_2.2
-
 hppa.*-.*-.*		libgcc_s=4
diff --git a/sysdeps/ia64/nptl/shlib-versions b/sysdeps/ia64/nptl/shlib-versions
deleted file mode 100644
index 90015eb..0000000
--- a/sysdeps/ia64/nptl/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-ia64.*-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/mips/nptl/shlib-versions b/sysdeps/mips/nptl/shlib-versions
deleted file mode 100644
index 97e41aa..0000000
--- a/sysdeps/mips/nptl/shlib-versions
+++ /dev/null
@@ -1 +0,0 @@
-mips.*-.*-linux.*	libpthread=0		GLIBC_2.0 GLIBC_2.2
diff --git a/sysdeps/aarch64/shlib-versions b/sysdeps/unix/sysv/linux/aarch64/shlib-versions
similarity index 100%
rename from sysdeps/aarch64/shlib-versions
rename to sysdeps/unix/sysv/linux/aarch64/shlib-versions
diff --git a/sysdeps/alpha/shlib-versions b/sysdeps/unix/sysv/linux/alpha/shlib-versions
similarity index 100%
rename from sysdeps/alpha/shlib-versions
rename to sysdeps/unix/sysv/linux/alpha/shlib-versions
diff --git a/sysdeps/arm/shlib-versions b/sysdeps/unix/sysv/linux/arm/shlib-versions
similarity index 100%
rename from sysdeps/arm/shlib-versions
rename to sysdeps/unix/sysv/linux/arm/shlib-versions
diff --git a/sysdeps/unix/sysv/linux/hppa/shlib-versions b/sysdeps/unix/sysv/linux/hppa/shlib-versions
new file mode 100644
index 0000000..ee46e4a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/hppa/shlib-versions
@@ -0,0 +1,9 @@
+hppa.*-.*-.*		libm=6			GLIBC_2.2
+
+hppa.*-.*-.*		libc=6			GLIBC_2.2
+
+hppa.*-.*-.*		ld=ld.so.1		GLIBC_2.2
+
+hppa-.*-.*		libBrokenLocale=1	GLIBC_2.2
+
+hppa.*-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/ia64/shlib-versions b/sysdeps/unix/sysv/linux/ia64/shlib-versions
similarity index 79%
rename from sysdeps/ia64/shlib-versions
rename to sysdeps/unix/sysv/linux/ia64/shlib-versions
index b41f6c2..c8e1482 100644
--- a/sysdeps/ia64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/ia64/shlib-versions
@@ -4,3 +4,5 @@ ia64-.*-linux.*		libm=6.1		GLIBC_2.2
 ia64-.*-linux.*		ld=ld-linux-ia64.so.2	GLIBC_2.2
 
 ia64-.*-.*		libBrokenLocale=1	GLIBC_2.2
+
+ia64.*-.*-linux.*	libpthread=0		GLIBC_2.2
diff --git a/sysdeps/m68k/coldfire/shlib-versions b/sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions
similarity index 100%
rename from sysdeps/m68k/coldfire/shlib-versions
rename to sysdeps/unix/sysv/linux/m68k/coldfire/shlib-versions
diff --git a/sysdeps/microblaze/shlib-versions b/sysdeps/unix/sysv/linux/microblaze/shlib-versions
similarity index 100%
rename from sysdeps/microblaze/shlib-versions
rename to sysdeps/unix/sysv/linux/microblaze/shlib-versions
diff --git a/sysdeps/mips/shlib-versions b/sysdeps/unix/sysv/linux/mips/shlib-versions
similarity index 94%
rename from sysdeps/mips/shlib-versions
rename to sysdeps/unix/sysv/linux/mips/shlib-versions
index b153732..d1414ed 100644
--- a/sysdeps/mips/shlib-versions
+++ b/sysdeps/unix/sysv/linux/mips/shlib-versions
@@ -23,3 +23,5 @@ mips.*-.*-linux.*	libnss_hesiod=2		GLIBC_2.0 GLIBC_2.2
 mips.*-.*-linux.*	libnsl=1		GLIBC_2.0 GLIBC_2.2
 
 mips.*-.*-linux.*	librt=1			GLIBC_2.0 GLIBC_2.2
+
+mips.*-.*-linux.*	libpthread=0		GLIBC_2.0 GLIBC_2.2
diff --git a/sysdeps/tile/shlib-versions b/sysdeps/unix/sysv/linux/tile/shlib-versions
similarity index 100%
rename from sysdeps/tile/shlib-versions
rename to sysdeps/unix/sysv/linux/tile/shlib-versions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
index 5093c4c..90ea1b7 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/64/shlib-versions
@@ -1,3 +1,4 @@
 # Configuration		DEFAULT			Earliest symbol set
 # -------------		---------------		------------------------------
+x86_64-.*-linux.*	DEFAULT			GLIBC_2.2.5
 x86_64-.*-linux.*	libpthread=0		GLIBC_2.2.5
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
index 8fcad2e..8dd73e4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/shlib-versions
@@ -1,3 +1,4 @@
 # Configuration		DEFAULT			Earliest symbol set
 # -------------		---------------		------------------------------
+x86_64-.*-linux.*	DEFAULT			GLIBC_2.16
 x86_64-.*-linux.*	libpthread=0		GLIBC_2.16
diff --git a/sysdeps/x86_64/64/shlib-versions b/sysdeps/x86_64/64/shlib-versions
deleted file mode 100644
index 50dd908..0000000
--- a/sysdeps/x86_64/64/shlib-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-x86_64-.*-linux.*	DEFAULT			GLIBC_2.2.5
diff --git a/sysdeps/x86_64/x32/shlib-versions b/sysdeps/x86_64/x32/shlib-versions
deleted file mode 100644
index 223dfb6..0000000
--- a/sysdeps/x86_64/x32/shlib-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configuration		DEFAULT			Earliest symbol set
-# -------------		---------------		------------------------------
-x86_64-.*-linux.*	DEFAULT			GLIBC_2.16
