diff --git a/ChangeLog b/ChangeLog
index 4e52944526..de5eec17d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+1998-06-05  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sunrpc/xdr_rec.c (xdrrec_create): Add cast for *_ops array since
+	we cannot declare the struct element as const.
+	* sunrpc/xdr_mem.c (xdrmem_create): Likewise.
+	* sunrpc/xdr_stdio.c (xdrstdio_create): Likewise.
+
+1998-06-04  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* manual/Makefile: Include ../Makeconfig earlier.
+	(MAKEINFO, TEXI2DVI): Use defaults if ../Makeconfig does not
+	exist.
+	(dir-add.texinfo): Remove useless $(SHELL).
+
+1998-06-04  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Makefile (others): Build programs from install-bin.
+	* configure.in: Modify config.make only if is was just created and
+	move that command to second argument of AC_OUTPUT.  Add command to
+	set config_vars in config.status.
+
+1998-06-04  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* malloc/Makefile (address-width): Fix conditional.
+
 1998-06-03  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* libc.map: Add fattach, fdetach, getmsg, getpmsg, makecontext,
diff --git a/Makefile b/Makefile
index 44699ac158..57637f4494 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,10 @@ endif
 
 include Makerules
 
+ifeq ($(build-programs),yes)
+others: $(addprefix $(objpfx),$(install-bin))
+endif
+
 # Install from subdirectories too.
 install: subdir_install
 
diff --git a/configure.in b/configure.in
index df82d75213..7b07d4b0a1 100644
--- a/configure.in
+++ b/configure.in
@@ -1170,5 +1170,8 @@ RELEASE=`sed -n -e 's/^#define RELEASE "\([^"]*\)"/\1/p' < $srcdir/version.h`
 AC_SUBST(VERSION)
 AC_SUBST(RELEASE)
 
-AC_OUTPUT(config.make glibcbug ${config_makefile} ${config_uname}, ,
-          [echo '$config_vars' >> config.make; test -d bits || mkdir bits])
+AC_OUTPUT(config.make glibcbug ${config_makefile} ${config_uname}, [
+case $CONFIG_FILES in *config.make*)
+echo "$config_vars" >> config.make;;
+esac
+test -d bits || mkdir bits], [config_vars='$config_vars'])
diff --git a/malloc/Makefile b/malloc/Makefile
index 22049713d7..0da5540b44 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -51,7 +51,7 @@ generated = mtrace
 
 # The Perl script will print addresses and to do this nicely we must know
 # whether we are on a 32 or 64 bit machine.
-ifneq ($strip($(findstring wordsize-32,$(config-sysdirs))),)
+ifneq ($(findstring wordsize-32,$(config-sysdirs)),)
 address-width=10
 else
 address-width=18
diff --git a/manual/Makefile b/manual/Makefile
index 0a71d18c3a..c5ca263537 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -28,14 +28,17 @@ INSTALL_INFO = install-info
 all: dvi
 dvi: libc.dvi
 
-ifneq ($(strip $(MAKEINFO)),)
-all: info
-info: libc.info dir-add.info
-endif
-
 # Get glibc's configuration info.
 ifneq (,$(wildcard ../Makeconfig))
 include ../Makeconfig
+else
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+endif
+
+ifneq ($(strip $(MAKEINFO)),)
+all: info
+info: libc.info dir-add.info
 endif
 
 # Set chapters and chapters-incl[12].
@@ -91,10 +94,10 @@ stamp-summary: summary.awk $(chapters) $(chapters-incl)
 # access to the documentation of the function, variables, and other
 # definitions.
 dir-add.texinfo: xtract-typefun.awk $(chapters) $(chapters-incl)
-	$(SHELL) -c '(echo "@dircategory GNU C library functions";	\
+	(echo "@dircategory GNU C library functions";			\
 	 echo "@direntry";						\
 	 $(AWK) -f $^;							\
-	 echo "@end direntry";)' > $@.new
+	 echo "@end direntry") > $@.new
 	mv -f $@.new $@
 
 # Generate Texinfo files from the C source for the example programs.
diff --git a/resolv/Banner b/resolv/Banner
index a792533a9e..5d1fdeb336 100644
--- a/resolv/Banner
+++ b/resolv/Banner
@@ -1 +1 @@
-BIND-4.9.6-T1A
+BIND-4.9.7-REL
diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
index 028329c34e..47b87eaf7a 100644
--- a/sunrpc/xdr_mem.c
+++ b/sunrpc/xdr_mem.c
@@ -80,7 +80,9 @@ xdrmem_create (xdrs, addr, size, op)
 {
 
   xdrs->x_op = op;
-  xdrs->x_ops = &xdrmem_ops;
+  /* We have to add the const since the `struct xdr_ops' in `struct XDR'
+     is not `const'.  */
+  xdrs->x_ops = (struct xdr_ops *) &xdrmem_ops;
   xdrs->x_private = xdrs->x_base = addr;
   xdrs->x_handy = size;
 }
diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
index f855b3d90e..a4e28b0548 100644
--- a/sunrpc/xdr_rec.c
+++ b/sunrpc/xdr_rec.c
@@ -169,7 +169,9 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
   /*
    * now the rest ...
    */
-  xdrs->x_ops = &xdrrec_ops;
+  /* We have to add the const since the `struct xdr_ops' in `struct XDR'
+     is not `const'.  */
+  xdrs->x_ops = (struct xdr_ops *) &xdrrec_ops;
   xdrs->x_private = (caddr_t) rstrm;
   rstrm->tcp_handle = tcp_handle;
   rstrm->readit = readit;
diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
index 75c563daa9..8c3c5c7bb3 100644
--- a/sunrpc/xdr_stdio.c
+++ b/sunrpc/xdr_stdio.c
@@ -82,7 +82,9 @@ xdrstdio_create (xdrs, file, op)
 {
 
   xdrs->x_op = op;
-  xdrs->x_ops = &xdrstdio_ops;
+  /* We have to add the const since the `struct xdr_ops' in `struct XDR'
+     is not `const'.  */
+  xdrs->x_ops = (struct xdr_ops *) &xdrstdio_ops;
   xdrs->x_private = (caddr_t) file;
   xdrs->x_handy = 0;
   xdrs->x_base = 0;