diff --git a/ChangeLog b/ChangeLog
index 4ccce8a3d126ad9d97fd1f7f100f634feae57b38..7410ce65f17fac8f8b92e7bec67258ab9cf705e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan  4 01:06:55 1998  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* config.sub: Add mingw32 support.
+	* configure.in: Likewise.
+	* config/mh-mingw32: New file.
+
 Sat Jan  3 12:11:05 1998 Franz Sirl <franz.sirl-kernel@lauterbach.com>
 
 	* configure.in: Finalize support for {alpha|powerpc}*-*-linux-gnulibc1
diff --git a/config.sub b/config.sub
index c771bc2cc7013019ecafb48906de01e884248c76..5e86b84d5f4180e948c86ccfa3f1571f015620f3 100755
--- a/config.sub
+++ b/config.sub
@@ -462,6 +462,10 @@ case $basic_machine in
 		basic_machine=i386-unknown
 		os=-go32
 		;;
+	i386-mingw32 | mingw32)
+		basic_machine=i386-unknown
+		os=-mingw32
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
diff --git a/config/mh-mingw32 b/config/mh-mingw32
new file mode 100644
index 0000000000000000000000000000000000000000..8c4839d89d62dda2c888f75c221a301162ef2815
--- /dev/null
+++ b/config/mh-mingw32
@@ -0,0 +1,12 @@
+# We don't want debugging info in Win32-hosted toolchains.
+# Accomplish this by overriding CFLAGS.
+CFLAGS=-O2
+CXXFLAGS=-O2
+
+# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
+# built without debugging information
+
+LIBGCC2_DEBUG_CFLAGS=
+
+# custom installation rules for mingw32 (append .exe to binaries, etc.)
+# INSTALL_DOSREL=install-dosrel
diff --git a/configure.in b/configure.in
index 18469971a18d396376d80307a947c4ab651b4e95..68d0d9dd58e67081b059e8c120b5dcc15fdbf661 100644
--- a/configure.in
+++ b/configure.in
@@ -182,6 +182,9 @@ case "${host}" in
   *-cygwin32*)
     host_makefile_frag="${host_makefile_frag} config/mh-cygwin32"
     ;;
+  *-mingw32*)
+    host_makefile_frag="${host_makefile_frag} config/mh-mingw32"
+    ;;
   *-windows*)
     host_makefile_frag="${host_makefile_frag} config/mh-windows"
     ;;
@@ -462,6 +465,8 @@ done
 case "${host}" in
 	i[3456]86-*-go32*)
 	  configdirs="$configdirs dosrel" ;;
+	i[3456]86-*-mingw32*)
+	  configdirs="$configdirs dosrel" ;;
 	*-cygwin32*)
 	  configdirs="$configdirs dosrel" ;;
 esac
@@ -479,6 +484,10 @@ case "${host}" in
   i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
     noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db sn gnuserv"
 	;;
+  i[3456]86-*-mingw32*)
+    # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db sn gnuserv"
+     noconfigdirs="expect dejagnu cvs autoconf automake send-pr gprof rcs guile perl texinfo apache inet"
+	;;
   *-*-cygwin32)
      noconfigdirs="expect dejagnu cvs autoconf automake bison send-pr gprof rcs guile perl texinfo apache inet"
     ;;
@@ -564,6 +573,17 @@ case "${target}" in
     # linux has rx in libc
     skipdirs="$skipdirs target-librx"
     ;;
+  i[3456]86-*-mingw32*)
+    target_configdirs="$target_configdirs target-mingw"
+    noconfigdirs="$noconfigdirs expect target-libgloss"
+
+    # Can't build gdb for cygwin32 if not native.
+    case "${host}" in
+      i[3456]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
+      *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db sn gnuserv"
+         ;;
+    esac
+    ;;    
   *-*-cygwin32)
     target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs expect target-libgloss"
@@ -956,10 +976,10 @@ if [ "${shared}" = "yes" ]; then
   esac
 fi
 
-# If we are building for a cygwin32 host, then set INSTALL_PROGRAM_ARGS to
+# If we are building for a win32 host, then set INSTALL_PROGRAM_ARGS to
 # -x.  This will cause programs to be installed with .exe extensions.
 case "${host}" in
-*-*-cygwin32*)
+*-*-cygwin32* | i[3456]86-*-mingw32)
     sed -e 's/^INSTALL_PROGRAM_ARGS[ 	]*=.*$/INSTALL_PROGRAM_ARGS = -x/' \
 	Makefile > Makefile.tem
     rm -f Makefile