diff --git a/ChangeLog b/ChangeLog
index 2996fd6da7..982f148016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1998-08-18  Roland McGrath  <roland@baalperazim.frob.com>
+
+	* Rules (binaries-static, binaries-shared static pattern rules):
+	Depend on lib%, not just libc%, from $(link-libc{,-static}).
+
+	* sysdeps/mach/hurd/Makefile (link-libc-static): New variable; set
+	this here, overriding Makeconfig generic value so we link against
+	the RPC libs.
+
 1998-08-17  Ulrich Drepper  <drepper@cygnus.com>
 
 	* posix/tstgetopt.c (options): Add NULL entry at end
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index c4282d1754..afd8473540 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -125,6 +125,22 @@ $(inst_libdir)/libc.so: $(rpcuserlibs)
 ifeq (elf,$(subdir))
 $(objpfx)librtld.os: $(rpcuserlibs:.so=_pic.a)
 endif
+
+# We need these libs to link static programs in the libc source tree, too.
+ifeq (yes,$(build-static))
+link-libc-static := -Wl,-\( \
+		    $(patsubst %,$(common-objpfx)%.a,\
+			       libc mach/libmachuser hurd/libhurduser) \
+		    $(gnulib) -Wl,-\)
+else
+ifeq (yes,$(build-shared))
+# We can try to link the programs with lib*_pic.a...
+link-libc-static := $(link-libc) -Wl,-\( \
+		    $(patsubst %,$(common-objpfx)%_pic.a,\
+			       libc mach/libmachuser hurd/libhurduser) \
+		    $(gnulib) -Wl,-\)
+endif
+endif
 
 ifeq (hurd, $(subdir))
 sysdep_routines += cthreads