diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf3ba23ae09c2a942ea851e339d03fb66cfe6aa6..43415cc423d0d53a9c39233a979749709d611961 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Tue May 26 23:47:52 1998  Mumit Khan <khan@xraylith.wisc.edu>
+
+	* Makefile.in (gencheck.o): Use HOST_CC.
+	* i386/t-mingw32: New file.
+	* configure.in (i386-*-mingw32*): Use.
+
 Tue May 26 07:31:04 1998  Richard Earnshaw (rearnsha@arm.com)
 
 	* arm.c (bad_signed_byte_operand): New predicate function.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c12b19da99b9f1dc46059cadf0cdfcd4594ade96..2afcc225419c4bbf02c98b58ecc2ec5c5e141472 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1325,6 +1325,9 @@ gencheck : gencheck.o tree.h tree.def $(HOST_LIBDEPS)
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \
 	 gencheck.o $(HOST_LIBS)
 
+gencheck.o : gencheck.c hconfig.h system.h
+	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gencheck.c
+
 dumpvers: dumpvers.c
 
 version.o: version.c
diff --git a/gcc/config/i386/t-mingw32 b/gcc/config/i386/t-mingw32
new file mode 100644
index 0000000000000000000000000000000000000000..fe948c6d15ec654a230cbbf8a39b8abe05cc1642
--- /dev/null
+++ b/gcc/config/i386/t-mingw32
@@ -0,0 +1,4 @@
+#
+# collect2 doesn't work for i386-mingw32* yet.
+#
+USE_COLLECT2=
diff --git a/gcc/configure b/gcc/configure
index 23757416b8e470dc1405c392103e346b7d8cbda9..7d584b8ee1cd0f2d071242a71c4f9fafdef2125b 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -2964,7 +2964,7 @@ for machine in $build $host $target; do
 	i[34567]86-*-mingw32*)
 		tm_file=i386/mingw32.h
 		xm_file="${xm_file} i386/xm-mingw32.h"
-		tmake_file=i386/t-cygwin32
+		tmake_file="i386/t-cygwin32 i386/t-mingw32"
 		extra_objs=winnt.o
 		xmake_file=i386/x-cygwin32
 		fixincludes=Makefile.in
diff --git a/gcc/configure.in b/gcc/configure.in
index bb6b46c773e14d243808d39b6be3f7ae72164afe..3d97e053d8dbf3de51898e99a01084c45aa51ea5 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1120,7 +1120,7 @@ for machine in $build $host $target; do
 	i[[34567]]86-*-mingw32*)
 		tm_file=i386/mingw32.h
 		xm_file="${xm_file} i386/xm-mingw32.h"
-		tmake_file=i386/t-cygwin32
+		tmake_file="i386/t-cygwin32 i386/t-mingw32"
 		extra_objs=winnt.o
 		xmake_file=i386/x-cygwin32
 		fixincludes=Makefile.in