diff --git a/config.guess b/config.guess
index e81d3ae..dab385e 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2021-06-03'
+timestamp='2021-10-27'
 
 # 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
@@ -1531,6 +1531,9 @@ EOF
     amd64:Isilon\ OneFS:*:*)
 	GUESS=x86_64-unknown-onefs
 	;;
+    i*86:Fiwix:*:*)
+	GUESS=$UNAME_MACHINE-pc-fiwix
+	;;
     *:Unleashed:*:*)
 	GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
 	;;
diff --git a/config.sub b/config.sub
index d74fb6d..424cb18 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2021-08-14'
+timestamp='2021-20-27'
 
 # 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
@@ -1748,7 +1748,8 @@ case $os in
 	     | skyos* | haiku* | rdos* | toppers* | drops* | es* \
 	     | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
 	     | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
-	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*)
+	     | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
+	     | fiwix* )
 		;;
 	# This one is extra strict with allowed versions
 	sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index bc26e03..6f8f7d7 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -73,6 +73,7 @@ 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
+i386 | 3.1 | Fiwix | ignored | ignored | i386-pc-fiwix
 i386 | ignored | VOS | ignored | ignored | i386-stratus-vos
 i586 | 1.0 | SolidBSD | ignored | ignored | i586-unknown-solidbsd1.0
 i586 | 5.0.0 | skyos | ignored | ignored | i586-pc-skyos5.0.0
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index d58521b..d911c5b 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -262,6 +262,7 @@ i386-cloudabi					i386-pc-cloudabi
 i386-drops1.0					i386-pc-drops1.0
 i386-elf					i386-pc-elf
 i386-es						i386-pc-es
+i386-fiwix					i386-pc-fiwix
 i386-freebsd					i386-pc-freebsd
 i386-glidix					i386-pc-glidix
 i386-haiku					i386-pc-haiku