diff --git a/ChangeLog b/ChangeLog
index 76bbb73cac..1db8e3197d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2015-09-04  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #14912]
+	* bits/linkmap.h: Move to ...
+	* sysdeps/generic/linkmap.h: ...here.
+	* sysdeps/aarch64/bits/linkmap.h: Move to ...
+	* sysdeps/aarch64/linkmap.h: ...here.
+	* sysdeps/arm/bits/linkmap.h: Move to ...
+	* sysdeps/arm/linkmap.h: ...here.
+	* sysdeps/hppa/bits/linkmap.h: Move to ...
+	* sysdeps/hppa/linkmap.h: ...here.
+	* sysdeps/ia64/bits/linkmap.h: Move to ...
+	* sysdeps/ia64/linkmap.h: ...here.
+	* sysdeps/mips/bits/linkmap.h: Move to ...
+	* sysdeps/mips/linkmap.h: ...here.
+	* sysdeps/s390/bits/linkmap.h: Move to ...
+	* sysdeps/s390/linkmap.h: ...here.
+	* sysdeps/sh/bits/linkmap.h: Move to ...
+	* sysdeps/sh/linkmap.h: ...here.
+	* sysdeps/x86/bits/linkmap.h: Move to ...
+	* sysdeps/x86/linkmap.h: ...here.
+	* include/link.h: Include <linkmap.h> instead of <bits/linkmap.h>.
+
 2015-09-04  Andreas Schwab  <schwab@suse.de>
 
 	[BZ #18635]
diff --git a/include/link.h b/include/link.h
index 7e7eb79f10..e44110c843 100644
--- a/include/link.h
+++ b/include/link.h
@@ -39,7 +39,7 @@ extern unsigned int la_objopen (struct link_map *__map, Lmid_t __lmid,
 
 #include <stdint.h>
 #include <stddef.h>
-#include <bits/linkmap.h>
+#include <linkmap.h>
 #include <dl-fileid.h>
 #include <dl-lookupcfg.h>
 #include <tls.h>
diff --git a/sysdeps/aarch64/bits/linkmap.h b/sysdeps/aarch64/linkmap.h
similarity index 100%
rename from sysdeps/aarch64/bits/linkmap.h
rename to sysdeps/aarch64/linkmap.h
diff --git a/sysdeps/arm/bits/linkmap.h b/sysdeps/arm/linkmap.h
similarity index 100%
rename from sysdeps/arm/bits/linkmap.h
rename to sysdeps/arm/linkmap.h
diff --git a/bits/linkmap.h b/sysdeps/generic/linkmap.h
similarity index 100%
rename from bits/linkmap.h
rename to sysdeps/generic/linkmap.h
diff --git a/sysdeps/hppa/bits/linkmap.h b/sysdeps/hppa/linkmap.h
similarity index 100%
rename from sysdeps/hppa/bits/linkmap.h
rename to sysdeps/hppa/linkmap.h
diff --git a/sysdeps/ia64/bits/linkmap.h b/sysdeps/ia64/linkmap.h
similarity index 100%
rename from sysdeps/ia64/bits/linkmap.h
rename to sysdeps/ia64/linkmap.h
diff --git a/sysdeps/mips/bits/linkmap.h b/sysdeps/mips/linkmap.h
similarity index 100%
rename from sysdeps/mips/bits/linkmap.h
rename to sysdeps/mips/linkmap.h
diff --git a/sysdeps/s390/bits/linkmap.h b/sysdeps/s390/linkmap.h
similarity index 100%
rename from sysdeps/s390/bits/linkmap.h
rename to sysdeps/s390/linkmap.h
diff --git a/sysdeps/sh/bits/linkmap.h b/sysdeps/sh/linkmap.h
similarity index 100%
rename from sysdeps/sh/bits/linkmap.h
rename to sysdeps/sh/linkmap.h
diff --git a/sysdeps/x86/bits/linkmap.h b/sysdeps/x86/linkmap.h
similarity index 100%
rename from sysdeps/x86/bits/linkmap.h
rename to sysdeps/x86/linkmap.h