diff --git a/ChangeLog b/ChangeLog
index 76a160938f47612b99e206c0118110781bfacee4..5fd240466d64a8ccd5ff3564fec50bd672ca09ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 11 01:19:31 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* config.sub: Add i386-uwin support.
+	* config.guess: Likewise.
+
 Thu Mar 11 01:07:55 1999  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
 
 	* configure.in: cleanup, add mh-*pic handling for arm, special
diff --git a/config.guess b/config.guess
index 49a24ddc06b2d56e747025277c841eff4d6799be..f3fce22efa67810b2786084219b9cd26ef1dc672 100755
--- a/config.guess
+++ b/config.guess
@@ -539,6 +539,9 @@ EOF
 	# i386?
 	echo i386-pc-interix
 	exit 0 ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin32
 	exit 0 ;;
diff --git a/config.sub b/config.sub
index 05eb93cc48da6387cc8387bab407fb013106adff..4f442ec3f7867511b962798f02e16a92636989b6 100755
--- a/config.sub
+++ b/config.sub
@@ -937,7 +937,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* )
+	      | -interix* | -uwin* )
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	# EGCS LOCAL