diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 4601068c7..677653194 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-23  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* Makefile.in: Use /bin/mkdir to make install directories.
+
 2012-11-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sysv_sem.cc (semundo_clear): Move condition to break from
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index 3522f9d6e..e633e9b01 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -54,11 +54,8 @@ CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
 
 all: cygserver.exe
 
-install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README
-	$(updir1)/mkinstalldirs $(DESTDIR)$(sbindir)
-	$(updir1)/mkinstalldirs $(DESTDIR)$(bindir)
-	$(updir1)/mkinstalldirs $(DESTDIR)$(sysconfdir)/defaults/etc
-	$(updir1)/mkinstalldirs $(DESTDIR)$(prefix)/share/doc/Cygwin
+install: all cygserver.conf cygserver-config README
+	/bin/mkdir -p $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)/defaults/etc $(DESTDIR)$(prefix)/share/doc/Cygwin
 	$(INSTALL_PROGRAM) cygserver.exe $(DESTDIR)$(sbindir)/cygserver.exe
 	$(INSTALL_PROGRAM) $(srcdir)/cygserver-config $(DESTDIR)$(bindir)/cygserver-config
 	$(INSTALL_DATA) $(srcdir)/cygserver.conf $(DESTDIR)$(sysconfdir)/defaults/etc/cygserver.conf
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2f6e48655..d943a862a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-23  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* Makefile.in: Use explicit path to mkdir.
+
 2012-11-22  Christopher Faylor  <me.cygwin2012@cgf.cx>
 
 	* select.cc (select): Don't return -1 when we've timed out after
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index edbc0e27e..ebc6ae4ca 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -438,7 +438,7 @@ $(LIBSERVER): ${cygserver_blddir}/Makefile
 	$(MAKE) -C ${cygserver_blddir} libcygserver.a
 
 ${cygserver_blddir}/Makefile:
-	mkdir -p ${@D}
+	/bin/mkdir -p ${@D}
 	cd ${@D} && exec /bin/sh $(dir ${srcdir})/cygserver/configure ${configure_args}
 
 dll_ofiles: $(DLL_OFILES)
diff --git a/winsup/lsaauth/ChangeLog b/winsup/lsaauth/ChangeLog
index b838bb9b3..d1ae685a5 100644
--- a/winsup/lsaauth/ChangeLog
+++ b/winsup/lsaauth/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-23  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* Makefile.in: Use /bin/mkdir to make directories.
+
 2012-10-24  Corinna Vinschen  <corinna@vinschen.de>
 
 	* configure.in: Add AC_NO_EXECUTABLES.
diff --git a/winsup/lsaauth/Makefile.in b/winsup/lsaauth/Makefile.in
index 2bb08fbec..8fbb2a45a 100644
--- a/winsup/lsaauth/Makefile.in
+++ b/winsup/lsaauth/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2008, 2009, 2011 Red Hat, Inc.
+# Copyright (c) 2006, 2008, 2009, 2011, 2012 Red Hat, Inc.
 #
 #     This program is free software; you can redistribute it and/or modify
 #     it under the terms of the GNU General Public License as published by
@@ -83,7 +83,7 @@ clean:
 	rm -f *.o *.dll cyglsa.def
 
 install: all
-	$(SHELL) $(updir1)/mkinstalldirs $(DESTDIR)$(bindir)
+	/bin/mkdir -p $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(DLL32) $(DESTDIR)$(bindir)/$(DLL32)
 	$(INSTALL_PROGRAM) $(DLL64) $(DESTDIR)$(bindir)/$(DLL64)
 	$(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(DESTDIR)$(bindir)/cyglsa-config
diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 4d934a437..c9c67636d 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-23  Christopher Faylor  <me.cygwin2012@cgf.cx>
+
+	* Makefile.in: Remove old Makefile.common'isms.  Don't rely on
+	in-build tools.
+
 2012-04-24  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* configure: Regenerate.
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index f47ddcb55..04ff99bc0 100644
--- a/winsup/testsuite/Makefile.in
+++ b/winsup/testsuite/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile.in for Cygwin's testsuite.
-# Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2009 Red Hat, Inc.
+# Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2009, 2012 Red Hat, Inc.
 #
 # This file is part of Cygwin.
 #
@@ -161,13 +161,7 @@ testsuite/site.exp: site.exp
 # Note: we set the PATH so that we can pick up cygwin0.dll
 
 check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp
-	cd testsuite; \
-	export EXPECT=expect ; \
-	if [ -f $(bupdir2)/expect/expect ] ; then  \
-	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../../tcl/library ; pwd` ; \
-	    export TCL_LIBRARY ; fi ; \
-	PATH=$(bupdir)/cygwin:$${PATH} ;\
-	runtest --tool winsup $(RUNTESTFLAGS) ;\
+	cd testsuite; runtest --tool winsup $(RUNTESTFLAGS)
 
 cygrun.o: cygrun.c
 	${MINGW_FE} $(CC) $(MINGW_CFLAGS) -o $@ -c $<