diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3324b612a..202db4d39 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 16 19:27:27 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Just use library files from this tree when building
+	cygrun.exe.
+	* path.cc (chdir): Don't set cache to offending chdir.  Change comment
+	to reflect current reality.
+
 Thu Jun 16 20:55:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
 	* cygwin.din: Define symbols for `cygwin_logon_user' and
@@ -27,12 +34,7 @@ Thu Jun 16 20:55:00 2000  Corinna Vinschen <corinna@vinschen.de>
 	(getegid): Return effective gid.
 	include/sys/cygwin.h: Add prototypes for `cygwin_logon_user' and
 	`cygwin_set_impersonation_token'.
-	include/cygwin/version.h: Bumb API minor version to 22.
-
-Thu Jun 15 18:12:36 2000  Christopher Faylor <cgf@cygnus.com>
-
-	* path.cc (chdir): Don't set cache to offending chdir.  Change comment
-	to reflect current reality.
+	include/cygwin/version.h: Bump API minor version to 22.
 
 Thu Jun 15 15:43:50 2000  Christopher Faylor <cgf@cygnus.com>
 
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index a503bce02..60152dcb6 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -197,9 +197,9 @@ winver_stamp: mkvers.sh include/cygwin/version.h winver.rc $(DLL_OFILES)
 	touch $@; \
 	$(COMPILE_CXX) -o version.o version.cc
 
-cygrun.exe : cygrun.o $(DLL_IMPORTS) $(w32api_lib)/libuser32.a \
-	     $(w32api_lib)/libshell32.a
-	$(CC) -o $@ -L$(w32api_lib) ${word 1,$^}
+cygrun.exe : cygrun.o $(LIB_NAME) $(w32api_lib)/libuser32.a \
+	     $(w32api_lib)/libshell32.a $(w32api_lib)/libkernel32.a
+	$(CC) -nodefaultlibs -o $@ $^ $(LIBGCC)
 
 #
 
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 4952d4608..27413afb8 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2471,7 +2471,7 @@ chdir (const char *dir)
     {
       /* Store new cache information */
       free (cwd_win32);
-      cwd_win32 = strdup (path);;
+      cwd_win32 = strdup (path);
 
       char pathbuf[MAX_PATH];
       (void) normalize_posix_path (cwd_posix, dir, pathbuf);
@@ -2479,7 +2479,7 @@ chdir (const char *dir)
       cwd_posix = strdup (pathbuf);
     }
 
-  syscall_printf ("%d = chdir (%s <dos %s>)", res, cwd_posix, cwd_win32);
+  syscall_printf ("%d = chdir() cwd_posix '%s' native '%s'", res, cwd_posix, native_dir);
   return res;
 }