diff --git a/ChangeLog b/ChangeLog
index 1df7fc6..9ccf834 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-10  Ben Elliston  <bje@gnu.org>
+
+	Reported by thom.fitzpatrick@hp.com.
+	* config.guess (x86_64:VMkernel:*:*): New.
+	* testsuite/config-guess.data: Add test case.
+
 2012-01-28  Bruno Haible  <bruno@clisp.org>
 	    Ben Elliston  <bje@gnu.org>
 
diff --git a/config.guess b/config.guess
index 49ba16f..9af9835 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+timestamp='2012-02-10'
 
 # 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
@@ -1320,6 +1320,9 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index 45285f2..2130b89 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -49,5 +49,6 @@ x86	5.2			Interix		ignored	i586-pc-interix5.2
 x86	6.0			Interix		ignored	i586-pc-interix6.0
 x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
 x86_64	2.6.32			Linux		ignored	x86_64-unknown-linux-gnu
+x86_64	2.6.32			VMkernel	ignored	x86_64-unknown-esx
 x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
 xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu