diff --git a/ChangeLog b/ChangeLog
index f3ead05dfac..3a92a28c403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@ Wed Feb 17 01:38:59 1999  H.J. Lu  (hjl@gnu.org)
 	* Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR)
 	only if it is not empty.
 
+1999-02-17  Nick Clifton  <nickc@cygnus.com>
+
+	Patch from: Scott Bambrough <scottb@corelcomputer.com>
+	
+	* config.guess: Modified to recognize uname's armv* syntax. 
+
+	* config.sub: Modified to recognize uname's armv* syntax.
+
 Sun Feb  7 18:01:54 1999  Mumit Khan  <khan@xraylith.wisc.edu>
 	
 	* configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of
diff --git a/config.guess b/config.guess
index 907a23fc77b..49a24ddc06b 100755
--- a/config.guess
+++ b/config.guess
@@ -552,6 +552,7 @@ EOF
 	# uname on the ARM produces all sorts of strangeness, and we need to
 	# filter it out.
 	case "$UNAME_MACHINE" in
+	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
 	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
 	esac
 
diff --git a/config.sub b/config.sub
index f361a6e5d9c..e539cc35868 100755
--- a/config.sub
+++ b/config.sub
@@ -221,7 +221,7 @@ case $basic_machine in
 	      | sparc64-* | sparcv9-* | sparc86x-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
 	      | mipstx39-* | mipstx39el-* \
-	      | f301-*)
+	      | f301-* | armv-*-*)
 		;;
 	m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | h8500-* | d10v-*) # CYGNUS LOCAL
 		;;
@@ -564,6 +564,10 @@ case $basic_machine in
 		basic_machine=i386-unknown		# CYGNUS LOCAL
 		os=-netbsd
 		;;
+	netwinder)
+		basic_machine=armv4l-corel
+		os=-linux
+		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
@@ -1037,6 +1041,9 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
+	arm*-corel)
+		os=-linux
+		;;
 	arm*-semi)
 		os=-aout
 		;;