diff --git a/ChangeLog b/ChangeLog
index 834f4e5..c2b9453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-09-27  Fabrice Fontaine  <fontaine.fabrice@gmail.com>
+
+	* config.sub (uclinux-uclibc*): Fix detection.
+	* testsuite/config-sub.data: Add a test case to avoid regression.
+
 2020-09-19  Bruno Haible  <bruno@clisp.org>
 
 	* config.guess: Don't use 'ldd --version' to determine the presence of
diff --git a/config.sub b/config.sub
index 780c2bb..9bc49a7 100755
--- a/config.sub
+++ b/config.sub
@@ -1735,6 +1735,8 @@ esac
 case $kernel-$os in
 	linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* )
 		;;
+	uclinux-uclibc* )
+		;;
 	-dietlibc* | -newlib* | -musl* | -uclibc* )
 		# These are just libc implementations, not actual OSes, and thus
 		# require a kernel.
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 3373546..1a818ca 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -728,6 +728,7 @@ tpf						s390x-ibm-tpf
 tron						tron-unknown-none
 ubicom32-elf					ubicom32-unknown-elf
 ubicom32					ubicom32-unknown-none
+arm-uclinux-uclibcgnueabi			arm-unknown-uclinux-uclibcgnueabi
 udi29k						a29k-amd-udi
 ultra3						a29k-nyu-sym1
 umax						ns32k-encore-bsd