diff --git a/ChangeLog b/ChangeLog
index f7ba1c0fd5..27083acbb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Sun Jun  9 01:11:49 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* Makerules (make-target-directory): Use ./mkinstalldirs so we do not
+	assume . is in PATH.
+
+Sat Jun  8 22:05:03 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* math/Makefile (distribute): Comment out addition of
+	$(long-m-routines) sources until they are all written.
+
+	* math/Makefile (distribute): Append long double source names to this
+	instead of using elided-routines.
+
+Sat Jun  8 15:15:07 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
+
+	* mach/mach_shortcuts.c: Obsolete file removed.
+	* mach/mach_syscalls.h: Likewise.
+
+	* hurd/Makefile (distribute): Consolidate defns into one.
+
+	* time/Makefile (tzfiles): Add solar87 solar88 solar89.
+
 Fri Jun  7 16:48:13 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
 	* sysdeps/unix/sysv/linux/i386/Dist: New file, list sys/perm.h and
@@ -57,7 +79,7 @@ Fri Jun  7 16:48:13 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 	* posix/Makefile (headers): Add schedbits.h.
 
 	* math/Makefile (elided-routines): Add long double routines.
-	
+
 Fri Jun  7 11:02:22 1996  Miles Bader  <miles@gnu.ai.mit.edu>
 
 	* sysdeps/mach/hurd/getpriority.c (getpriority): Use new interface
diff --git a/Makerules b/Makerules
index 32bb8bcab7..bc8d7154d4 100644
--- a/Makerules
+++ b/Makerules
@@ -520,7 +520,7 @@ endef
 # Make the target directory if it doesn't exist, using the `mkinstalldirs'
 # script that does `mkdir -p' even if `mkdir' doesn't support that flag.
 define make-target-directory
-$(addprefix $(..)mkinstalldirs ,\
+$(addprefix $(..)./mkinstalldirs ,\
 	    $(filter-out $(wildcard $(@D:%/=%)),$(@D:%/=%)))
 endef
 
diff --git a/hurd/Makefile b/hurd/Makefile
index 84e2bdf376..4f1f22c7c8 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -28,8 +28,6 @@ headers = hurd.h $(interface-headers) \
 	  $(addprefix hurd/,fd.h id.h port.h signal.h sigpreempt.h ioctl.h\
 			    userlink.h resource.h threadvar.h lookup.h)
 
-distribute := hurdstartup.h hurdfault.h intr-rpc.defs STATUS
-
 # The RPC interfaces go in a separate library.
 interface-library := libhurduser
 user-interfaces		:= $(addprefix hurd/,\
@@ -59,7 +57,7 @@ sig	= hurdsig hurdfault siginfo hurd-raise preempt-sig \
 dtable	= dtable port2fd new-fd alloc-fd intern-fd \
 	  getdport openport \
 	  fd-close fd-read fd-write hurdioctl ctty-input ctty-output
-distribute = intr-rpc.defs intr-rpc.h faultexc.defs
+distribute = hurdstartup.h hurdfault.h faultexc.defs intr-rpc.defs intr-rpc.h
 
 # XXX this is a temporary hack; see hurdmalloc.h
 routines += hurdmalloc
diff --git a/mach/mach_shortcuts.c b/mach/mach_shortcuts.c
deleted file mode 100644
index ef1792b003..0000000000
--- a/mach/mach_shortcuts.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <mach/mach_types.h>
-#include <mach/mach_port.h>
-
-#define	SHORTCUT(name, number, args, typed_args)			      \
-kern_return_t __##name typed_args					      \
-{									      \
-  kern_return_t ret = __syscall_##name args;				      \
-  if (ret == MACH_SEND_INTERRUPTED)					      \
-    ret = __mig_##name args;						      \
-  return ret;								      \
-}
-
-#include "mach_shortcuts.h"
diff --git a/mach/mach_syscalls.h b/mach/mach_syscalls.h
deleted file mode 100644
index 8b33dc4e7e..0000000000
--- a/mach/mach_syscalls.h
+++ /dev/null
@@ -1,31 +0,0 @@
-SYSCALL (mach_msg_trap, -25,
-	 mach_msg_return_t,
-	 (msg, option, send_size,
-	  rcv_size, rcv_name, timeout, notify),
-	 (mach_msg_header_t *msg,
-	  mach_msg_option_t option,
-	  mach_msg_size_t send_size,
-	  mach_msg_size_t rcv_size,
-	  mach_port_t rcv_name,
-	  mach_msg_timeout_t timeout,
-	  mach_port_t notify))
-
-SYSCALL (mach_reply_port, -26,
-	 mach_port_t,
-	 (),
-	 (void))
-
-SYSCALL (mach_thread_self, -27,
-	 mach_port_t,
-	 (),
-	 (void))
-
-SYSCALL (mach_task_self, -28,
-	 mach_port_t,
-	 (),
-	 (void))
-
-SYSCALL (mach_host_self, -29,
-	 mach_port_t,
-	 (),
-	 (void))
diff --git a/math/Makefile b/math/Makefile
index eb8a7a57b8..beaa26912a 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -46,9 +46,9 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod	\
 libm-routines = $(libm-support) $(libm-calls) \
 		$(patsubst %_rf,%f_r,$(libm-calls:=f))	\
 		$(long-m-$(long-double-fcts))
-#long-m-yes = $(long-m-routines) # uncomment this when code is ready
 long-m-routines = $(patsubst %_rl,%l_r,$(libm-calls:=l)) # not ready yet
-elided-routines = $(long-m-routines)
+#long-m-yes = $(long-m-routines) # uncomment this when code works
+#distribute += $(long-m-routines:=.c) # and this when at least all files exist
 
 
 # These functions are in libc instead of libm because __printf_fp
@@ -57,7 +57,7 @@ elided-routines = $(long-m-routines)
 calls = s_isinf s_isnan
 routines = $(calls) $(calls:=f) $(long-c-$(long-double-fcts))
 long-c-yes = $(calls:=l)
-elided-routines += $(long-c-yes)
+distribute += $(long-c-yes:=.c)
 
 
 include ../Rules