diff --git a/config.guess b/config.guess
index a419d86..980b020 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 
 # shellcheck disable=SC2006,SC2268 # see below for rationale
 
-timestamp='2022-08-01'
+timestamp='2022-09-17'
 
 # 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
@@ -966,6 +966,12 @@ EOF
 	GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
 	GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
 	;;
+    x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
+	;;
+    *:[Mm]anagarm:*:*)
+	GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
+	;;
     *:Minix:*:*)
 	GUESS=$UNAME_MACHINE-unknown-minix
 	;;
diff --git a/doc/config.guess.1 b/doc/config.guess.1
index aeb8c8a..05433f9 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.48.5.
-.TH CONFIG.GUESS "1" "August 2022" "GNU config.guess (2022-08-01)" "User Commands"
+.TH CONFIG.GUESS "1" "September 2022" "GNU config.guess (2022-09-17)" "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 bd39f0f..bb427e5 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -26,6 +26,7 @@ SX-8R | 1.0 | SUPER-UX | ignored | ignored | sx8r-nec-superux1.0
 SX-ACE | 1.0 | SUPER-UX | ignored | ignored | sxace-nec-superux1.0
 aarch64 | ignored | Haiku | ignored | ignored | aarch64-unknown-haiku
 aarch64 | ignored | Linux | ignored | ignored | aarch64-unknown-linux-gnu
+aarch64 | ignored | Managarm | ignored | ignored | aarch64-unknown-managarm-mlibc
 aarch64_be | ignored | Linux | ignored | ignored | aarch64_be-unknown-linux-gnu
 amd64 | 1.5.12(0.116/4/2) | CYGWIN_NT-5.2 | ignored | ignored | x86_64-pc-cygwin
 amd64 | 6.1.4 | NetBSD | ignored | x86_64 | x86_64-unknown-netbsd6.1
@@ -115,6 +116,7 @@ riscv32 | ignored | Linux | ignored | ignored | riscv32-unknown-linux-gnu
 riscv32be | ignored | Linux | ignored | ignored | riscv32be-unknown-linux-gnu
 riscv64 | ignored | Haiku | ignored | ignored | riscv64-unknown-haiku
 riscv64 | ignored | Linux | ignored | ignored | riscv64-unknown-linux-gnu
+riscv64 | ignored | Managarm | ignored | ignored | riscv64-unknown-managarm-mlibc
 riscv64be | ignored | Linux | ignored | ignored | riscv64be-unknown-linux-gnu
 s390x | 5.6 | SunOS | ignored | ignored | s390x-ibm-solaris2.6
 sun3 | 4.0 | SunOS | ignored | ignored | m68k-sun-sunos4.0
@@ -140,4 +142,5 @@ x86_64 | 2.6.32 | Linux | ignored | ignored | x86_64-pc-linux-gnu
 x86_64 | 2.6.32 | VMkernel | ignored | ignored | x86_64-unknown-esx
 x86_64 | 8.0 | OS108 | ignored | ignored | x86_64-unknown-os108_8.0
 x86_64 | 1.0-dev | SerenityOS | ignored | ignored | x86_64-pc-serenity
+x86_64 | ignored | Managarm | ignored | ignored | x86_64-pc-managarm-mlibc
 xtensa | 2.6.15 | Linux | ignored | ignored | xtensa-unknown-linux-gnu