diff --git a/ChangeLog b/ChangeLog
index 2537e46d88..fb5da06175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Thu Jan 21 12:20:55 1993  Per Bothner  (bothner@cygnus.com)
+
+	* guess-systype:  Patches from John Eaton <jwe@che.utexas.edu>:
+	+ Add Convex, Cray/Unicos, and Encore/Multimax support. 
+	+ Execute ./dummy instead of assuming . is in PATH.
+
+Tue Jan 19 17:18:06 1993  Per Bothner  (bothner@cygnus.com)
+
+	* guess-systype:  New shell script.  Attempts to guess the
+	canonical host name of the executing host.
+	Only a few hosts are supported so far.
+	* configure:  Call guess-systype if no host is specified.
+
 Tue Jan 19 08:26:07 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* Makefile.in (gcc-no-fixedincludes): Made to work with current
diff --git a/guess-systype b/guess-systype
index c192834723..472e003ed9 100755
--- a/guess-systype
+++ b/guess-systype
@@ -49,6 +49,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     9000/8??:HP-UX:*:*)
 	echo hppa1.0-hp-hpux
 	exit 0 ;;
+    C1*:ConvexOS:*:*)
+	echo c1-convex-bsd
+        exit 0 ;;
+    C2*:ConvexOS:*:*)
+	echo c2-convex-bsd
+        exit 0 ;;
+    CRAY*X-MP:UNICOS:*:*)
+	echo xmp-cray-unicos
+        exit 0 ;;
+    CRAY*Y-MP:UNICOS:*:*)
+	echo ymp-cray-unicos
+        exit 0 ;;
+    CRAY-2:UNICOS:*:*)
+	echo cray2-cray-unicos
+        exit 0 ;;
     i[34]86:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux
 	exit 0 ;;
@@ -75,14 +90,28 @@ main()
   printf("m68k-sony-newsos\n"); exit(0);
 #endif
 #endif
+
 #if defined(hp300) && !defined(hpux)
   printf("m68k-hp-bsd\n"); exit(0);
 #endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf("ns32k-encore-sysv\n"); exit(0);
+#else
+#if defined (CMU)
+  printf("ns32k-encore-mach\n"); exit(0);
+#else
+  printf("ns32k-encore-bsd\n"); exit(0);
+#endif
+#endif
+#endif
+
   exit (1);
 }
 EOF
 
-${CC-cc} dummy.c -o dummy && dummy && rm dummy.c dummy && exit 0
+${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
 rm -f dummy.c dummy
 
 echo '(Unable to guess system type)' 1>&2