diff --git a/config.guess b/config.guess
index 3ed3dc7..1972fda 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2021 Free Software Foundation, Inc.
 
-timestamp='2021-01-19'
+timestamp='2021-01-25'
 
 # 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
@@ -1482,8 +1482,8 @@ EOF
     i*86:rdos:*:*)
 	echo "$UNAME_MACHINE"-pc-rdos
 	exit ;;
-    i*86:AROS:*:*)
-	echo "$UNAME_MACHINE"-pc-aros
+    *:AROS:*:*)
+	echo "$UNAME_MACHINE"-unknown-aros
 	exit ;;
     x86_64:VMkernel:*:*)
 	echo "$UNAME_MACHINE"-unknown-esx
diff --git a/doc/config.guess.1 b/doc/config.guess.1
index 0738678..75fbb23 100644
--- a/doc/config.guess.1
+++ b/doc/config.guess.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.16.
-.TH CONFIG.GUESS "1" "January 2021" "GNU config.guess (2021-01-19)" "User Commands"
+.TH CONFIG.GUESS "1" "January 2021" "GNU config.guess (2021-01-25)" "User Commands"
 .SH NAME
 config.guess \- guess the build system triplet
 .SH SYNOPSIS
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 155e9ce..9e09202 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -37,6 +37,7 @@ arc | ignored | Linux | ignored | ignored | arc-unknown-linux-gnu
 arceb | ignored | Linux | ignored | ignored | arceb-unknown-linux-gnu
 arm | 12.0 | FreeBSD | ignored | armv6 | armv6-unknown-freebsd12.0-gnueabihf
 arm | 12.0 | FreeBSD | ignored | armv7 | armv7-unknown-freebsd12.0-gnueabihf
+arm | 12.1 | AROS | ignored | armv7 | arm-unknown-aros
 arm | ignored | Linux | ignored | ignored | arm-unknown-linux-gnueabihf
 arm | ignored | RISCOS | ignored | ignored | arm-unknown-riscos
 arm | ignored | riscos | ignored | ignored | arm-unknown-riscos
@@ -66,7 +67,7 @@ hexagon | 1.0 | Linux | ignored | ignored | hexagon-unknown-linux-gnu
 i386 | 1.0 | MINGW | ignored | ignored | i386-pc-mingw32
 i386 | 1.0 | Minix | ignored | ignored | i386-unknown-minix
 i386 | 1.0 | Sortix | ignored | ignored | i386-unknown-sortix
-i386 | 12.1 | AROS | ignored | ignored | i386-pc-aros
+i386 | 12.1 | AROS | ignored | ignored | i386-unknown-aros
 i386 | 14.0 | Darwin | ignored | i386 | i386-apple-darwin14.0
 i386 | 4.0 | DYNIX/ptx | ignored | ignored | i386-sequent-sysv4
 i386 | 4.2 | LynxOS | ignored | ignored | i386-unknown-lynxos4.2
@@ -86,6 +87,7 @@ k1om | 2.6.38 | Linux | ignored | ignored | k1om-unknown-linux-gnu
 loongarch32 | ignored | Linux | ignored | ignored | loongarch32-unknown-linux-gnu
 loongarch64 | ignored | Linux | ignored | ignored | loongarch64-unknown-linux-gnu
 loongarchx32 | ignored | Linux | ignored | ignored | loongarchx32-unknown-linux-gnu
+m68k | 12.1 | AROS | ignored | ignored | m68k-unknown-aros
 m88k | 7.0 | CX/UX | ignored | ignored | m88k-harris-cxux7
 macppc | 1.0 | MirBSD | ignored | ignored | powerpc-unknown-mirbsd1.0
 mips | 1.0 | OSF1 | ignored | ignored | mips-dec-osf1
@@ -123,6 +125,7 @@ x86_64 | 1.0 | Sortix | ignored | ignored | x86_64-unknown-sortix
 x86_64 | 1.0 | Twizzler | ignored | ignored | x86_64-unknown-twizzler
 x86_64 | 1.1 | Unleashed | ignored | ignored | x86_64-unknown-unleashed1.1
 x86_64 | 1.5.18(0.132/4/2) | CYGWIN_NT-5.2 | ignored | ignored | x86_64-pc-cygwin
+x86_64 | 12.1 | AROS | ignored | ignored | x86_64-unknown-aros
 x86_64 | 14.0 | Darwin | ignored | i386 | x86_64-apple-darwin14.0
 x86_64 | 2.0.0(0.271/5/3) | MSYS_NT-6.1 | ignored | ignored | x86_64-pc-msys
 x86_64 | 2.6.32 | Linux | ignored | ignored | x86_64-pc-linux-gnu