diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog
index 87723a278..47ab35952 100644
--- a/winsup/testsuite/ChangeLog
+++ b/winsup/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-01  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in: Use utils mingw front-end to generate non-cygwin binary.
+
 2008-11-26  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* Revert erroneous checkin.
diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in
index d7d151501..f47ddcb55 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 Red Hat, Inc.
+# Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2009 Red Hat, Inc.
 #
 # This file is part of Cygwin.
 #
@@ -57,6 +57,7 @@ endif
 
 AR:=@AR@
 AR_FLAGS:=qv
+MINGW_FE:=$(dir ${srcdir})/utils/mingw
 
 #
 # Include common definitions for winsup directory
@@ -169,7 +170,7 @@ check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp
 	runtest --tool winsup $(RUNTESTFLAGS) ;\
 
 cygrun.o: cygrun.c
-	$(CC) $(MINGW_CFLAGS) -o $@ -c $<
+	${MINGW_FE} $(CC) $(MINGW_CFLAGS) -o $@ -c $<
 
 cygrun.exe : cygrun.o
-	$(CC) ${MINGW_LDFLAGS} -mno-cygwin -o $@ $<
+	${MINGW_FE} $(CC) ${MINGW_LDFLAGS} -o $@ $<