diff --git a/ChangeLog b/ChangeLog
index 3118582..e6836dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-02-29  Ossama Othman  <ossama@ece.uci.edu>
+
+	* config.sub: Add support for QNX Neutrino.
+
 2000-02-24  Nick Clifton  <nickc@cygnus.com>
 
 	* config.sub: Support an OS of "wince".
diff --git a/config.sub b/config.sub
index 5d75624..00b90f8 100755
--- a/config.sub
+++ b/config.sub
@@ -1022,6 +1022,9 @@ case $os in
         -*mint | -*MiNT)
 	        os=-mint
 		;;
+        -neutrino* | -nto*)
+                os=-neutrino
+                ;;
 	-none)
 		;;
 	*)
@@ -1242,6 +1245,9 @@ case $basic_machine in
 			-*mint | -*MiNT)
 				vendor=atari
 				;;
+			-neutrino* | -nto*)
+				vendor=qnx
+                                ;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;