diff --git a/ChangeLog b/ChangeLog
index 49c8abb..ebfbfc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-10  Hans-Peter Nilsson  <hp@axis.com>
+
+	* config.sub (os): Recognize axis as manufacturer.
+	(basic_machine): Recognize cris and etrax* as cris-axis.
+
 2000-05-31  Ben Elliston  <bje@redhat.com>
 
 	* config.sub: Accept athlon as an i686 variant. From Philipp
diff --git a/config.sub b/config.sub
index cb86fe1..0997570 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
 #   Free Software Foundation, Inc.
 
-version='2000-05-31'
+version='2000-06-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -132,7 +132,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
@@ -355,6 +355,9 @@ case $basic_machine in
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;