diff --git a/ChangeLog b/ChangeLog
index d7eb7549b3..399f30d956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2017-09-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* crypt/Banner: Remove file.
+	* nptl/Banner: Likewise.
+	* resolv/Banner: Likewise.
+	* soft-fp/Banner: Likewise.
+	* nptl/Makefile ($(objpfx)banner.h): Remove rule.
+	($(objpfx)version.d): Remove dependency on banner.h.
+	($(objpfx)version.os): Likewise.
+	* nptl/version.c (banner): Do not include banner.h.
+	* manual/contrib.texi: Update entries for Richard Henderson, Jakub
+	Jelinek and BIND code.
+
 2017-09-20  Paul Pluzhnikov  <ppluzhnikov@google.com>
 	    Carlos O'Donell  <carlos@redhat.com>
 
diff --git a/crypt/Banner b/crypt/Banner
deleted file mode 100644
index 9cb25bdf0c..0000000000
--- a/crypt/Banner
+++ /dev/null
@@ -1 +0,0 @@
-crypt add-on version 2.1 by Michael Glad and others
diff --git a/manual/contrib.texi b/manual/contrib.texi
index fff45b92b9..62798b091c 100644
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -149,7 +149,7 @@ implementations.
 
 @item
 Richard Henderson for the port to Linux on Alpha
-(@code{alpha-@var{anything}-linux}).
+(@code{alpha-@var{anything}-linux}) and software floating-point support.
 
 @item
 David Holsgrove for the port to Linux on MicroBlaze.
@@ -171,7 +171,8 @@ Aurelien Jarno for various fixes.
 Rical Jasan for contributing various fixes in @theglibc{} manual.
 
 @item
-Jakub Jelinek for implementing a number of checking functions and for
+Jakub Jelinek for implementing a number of checking functions,
+software floating-point support and for
 his direction as part of @theglibc{} steering committee.
 
 @item
@@ -450,7 +451,7 @@ code were written by Craig Metz; see the file @file{LICENSES} for
 details on their licensing.
 
 @item
-The DNS resolver code is taken directly from BIND 4.9.5, which
+The DNS resolver code is taken directly from BIND 8.2.3-T5B, which
 includes copyrighted code from UC Berkeley and from Digital Equipment
 Corporation.  See the file @file{LICENSES} for the text of the DEC license.
 
diff --git a/nptl/Banner b/nptl/Banner
deleted file mode 100644
index 8c88d52fdf..0000000000
--- a/nptl/Banner
+++ /dev/null
@@ -1 +0,0 @@
-Native POSIX Threads Library
diff --git a/nptl/Makefile b/nptl/Makefile
index 9925f0f745..d819349f43 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -677,11 +677,6 @@ generated += libpthread_nonshared.a \
 generated += $(objpfx)tst-atfork2.mtrace \
 	     $(addsuffix .so,$(strip $(modules-names)))
 
-$(objpfx)version.d: $(objpfx)banner.h
-$(objpfx)version.os: $(objpfx)banner.h
-$(objpfx)banner.h: Banner
-	sed 's/\(.*\)/"\1\\n"/' $< > $@
-generated += banner.h
 # Give libpthread.so an entry point and make it directly runnable itself.
 LDFLAGS-pthread.so += -e __nptl_main
 # pt-interp.c exists just to get the runtime linker path into libpthread.so.
diff --git a/nptl/version.c b/nptl/version.c
index d9513fb84f..313eb0cd7f 100644
--- a/nptl/version.c
+++ b/nptl/version.c
@@ -22,8 +22,8 @@
 
 
 static const char banner[] =
-#include "banner.h"
-"Copyright (C) 2017 Free Software Foundation, Inc.\n\
+"Native POSIX Threads Library\n\
+Copyright (C) 2017 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
 PARTICULAR PURPOSE.\n"
diff --git a/resolv/Banner b/resolv/Banner
deleted file mode 100644
index e585ed8532..0000000000
--- a/resolv/Banner
+++ /dev/null
@@ -1 +0,0 @@
-BIND-8.2.3-T5B
diff --git a/soft-fp/Banner b/soft-fp/Banner
deleted file mode 100644
index 940395cfe3..0000000000
--- a/soft-fp/Banner
+++ /dev/null
@@ -1 +0,0 @@
-software FPU emulation by Richard Henderson, Jakub Jelinek and others