diff --git a/ChangeLog b/ChangeLog
index a949228..4f106db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-08  Elad Lahav  <e2lahav@gmail.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub: Fix regression in QNX recognition.
+	* testsuite/config-sub.data: Add some test cases.
+
 2020-08-17  Issam E. Maghni  <issam.e.maghni@mailbox.org>
 
 	* config.guess: Replace "if [ EXPR ]" with "if test EXPR".
diff --git a/config.sub b/config.sub
index 0753e30..780c2bb 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2020-08-17'
+timestamp='2020-09-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1367,13 +1367,7 @@ case $os in
 		os=psos
 		;;
 	qnx*)
-		case $cpu in
-		    x86 | i*86)
-			;;
-		    *)
-			os=nto-$os
-			;;
-		esac
+		os=qnx
 		;;
 	hiux*)
 		os=hiuxwe2
@@ -1722,7 +1716,7 @@ case $os in
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* )
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 197fffc..3373546 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -772,7 +772,9 @@ x86_64-ericsson-dicos				x86_64-ericsson-dicos
 x86_64-fuchsia					x86_64-pc-fuchsia
 x86_64-genode					x86_64-pc-genode
 x86_64-glidix					x86_64-pc-glidix
+x86_64-nto					x86_64-pc-nto-qnx
 x86_64-os108					x86_64-pc-os108
+x86_64-qnx					x86_64-pc-qnx
 x86_64-pc-ptx					x86_64-pc-ptx
 x86_64-ptx					x86_64-pc-ptx
 x86_64-redox					x86_64-pc-redox