diff --git a/ChangeLog b/ChangeLog
index f29c3a8..a25c10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-07  Ben Elliston  <bje@gnu.org>
+
+	Reported by Nelson H. F. Beebe:
+	* config.guess (*:MidnightBSD:*:*): Recognise.
+	* testsuite/config-guess.data: Add a test case.
+
 2017-11-05  Ben Elliston  <bje@gnu.org>
 
 	Also revert -- these parens were there for a reason. :-(
diff --git a/config.guess b/config.guess
index 81fd8cb..9201400 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-11-04'
+timestamp='2017-11-07'
 
 # 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
@@ -244,6 +244,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
 	exit ;;
+    *:MidnightBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-midnightbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 9b78279..186af24 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -41,6 +41,7 @@ i386		 12.1			 AROS			 ignored	 ignored	 i386-pc-aros
 i386		 4.2			 LynxOS			 ignored	 ignored	 i386-unknown-lynxos4.2
 i386		 ignored		 VOS			 ignored	 ignored	 i386-stratus-vos
 i586		 1.0			 SolidBSD		 ignored	 ignored	 i586-unknown-solidbsd1.0
+i686		 1.0			 MidnightBSD		 ignored	 ignored	 i686-unknown-midnightbsd1.0
 i586		 5.0.0			 skyos			 ignored	 ignored	 i586-pc-skyos5.0.0
 i586		 ignored		 rdos			 ignored	 ignored	 i586-pc-rdos
 i686		 1.0.17(0.48/3/2)	 MSYS_NT-6.0		 ignored	 ignored	 i686-pc-msys