diff --git a/bin/config.guess b/bin/config.guess
index 46c1d11e74..a8be60f21c 100755
--- a/bin/config.guess
+++ b/bin/config.guess
@@ -309,6 +309,9 @@ EOF
     CRAY*TS:*:*:*)
 	echo crayts-cray-unicos
         exit 0 ;;
+    CRAY*T3E:*:*:*)
+        echo t3e-cray-unicosmk
+        exit 0 ;;
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
diff --git a/bin/config.sub b/bin/config.sub
index 535959c05a..d36d9ae227 100755
--- a/bin/config.sub
+++ b/bin/config.sub
@@ -225,6 +225,10 @@ case $basic_machine in
 		basic_machine=cray2-cray
 		os=-unicos
 		;;
+        cray-t3e | t3e | t3e-cray)
+                basic_machine=t3e-cray
+                os=-unicosmk
+                ;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;