diff --git a/ChangeLog b/ChangeLog
index f2df3e78a4..c052ebf06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Sep  7 18:41:17 1996  Richard Henderson  <rth@tamu.edu>
+
+	* Makeconfig (+link): Filter out start, pre & postinit from the
+	generic depenancies as well.
+	* Rules: Add start, pre & postinit to the dependancies of
+	$(others) and $(tests).
+
+	* configure.in: elf_dirs missing "sysdeps" component.
+
 Sun Sep  8 02:36:02 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* locale/SYS_libc.c (_libc_intl_domainname): Change value to "libc".
@@ -21,6 +30,8 @@ Sun Sep  8 02:36:02 1996  Ulrich Drepper  <drepper@cygnus.com>
 
 	* version.h (VERSION): Bump to 1.94.
 
+	* locale/Makefile (distribute): Add locale.c and localedef.c.
+
 Sat Sep  7 14:00:33 1996  David Mosberger-Tang  <davidm@azstarnet.com>
 
 	* catgets/catgets.c (catopen): Allocate sizeof(*result) bytes
diff --git a/Makeconfig b/Makeconfig
index 38589e7ebe..3134132fcc 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -303,7 +303,8 @@ ifndef +link
 +link = $(CC) -nostdlib -nostartfiles -o $@ \
 	      $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS)  \
 	      $(addprefix $(csu-objpfx),start.o) $(+preinit) \
-	      $(filter-out $(common-objpfx)libc%,$^) \
+	      $(filter-out $(addprefix $(csu-objpfx),start.o) $(+preinit) \
+		$(link-extra-libs) $(common-objpfx)libc% $(+postinit),$^) \
 	      $(link-extra-libs) $(link-libc) $(+postinit)
 endif
 ifndef config-LDFLAGS
diff --git a/Rules b/Rules
index b6215f59e0..640a2fe716 100644
--- a/Rules
+++ b/Rules
@@ -89,7 +89,8 @@ endif
 
 ifneq "$(strip $(others) $(tests))" ""
 $(addprefix $(objpfx),$(others) $(tests)): %: %.o \
-  $(sort $(filter $(common-objpfx)libc%,$(link-libc)))
+  $(sort $(filter $(common-objpfx)libc%,$(link-libc))) \
+  $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
 	$(+link)
 endif
 
diff --git a/configure b/configure
index d2f0c3c569..2d03f8c6da 100755
--- a/configure
+++ b/configure
@@ -878,7 +878,7 @@ if test "$elf" = yes; then
     esac
     for m in $mach; do
       if test -d $xsrcdir${d}sysdeps$m/elf; then
-	elf_dirs="$elf_dirs $d$m/elf"
+	elf_dirs="$elf_dirs ${d}sysdeps$m/elf"
       fi
     done
   done
diff --git a/configure.in b/configure.in
index ce9f61d967..76055a2342 100644
--- a/configure.in
+++ b/configure.in
@@ -248,7 +248,7 @@ if test "$elf" = yes; then
     esac
     for m in $mach; do
       if test -d $xsrcdir${d}sysdeps$m/elf; then
-	elf_dirs="$elf_dirs $d$m/elf"
+	elf_dirs="$elf_dirs ${d}sysdeps$m/elf"
       fi
     done
   done