diff --git a/ChangeLog b/ChangeLog
index 2f01eb989bf5fd29ad2c43b2cd1d2d5228a9a7d2..8d6a4305f5f7f4515294b875b4f30d0621929a6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Tue Apr 29 21:43:28 CEST 2008 Jim Meyering <meyering@redhat.com>
 	Fix build errors.
 	* proxy/Makefile.am (libvirt_proxy_LDADD): Add ../gnulib/lib/libgnu.la.
 	* gnulib/lib/arpa_inet.in.h: Add new file from gnulib.
+	* gnulib/tests/test-EOVERFLOW.c: Likewise.
 
 	update from gnulib
 	* gnulib/lib/inet_ntop.h: Remove file.
diff --git a/gnulib/tests/test-EOVERFLOW.c b/gnulib/tests/test-EOVERFLOW.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e5cc09c91f591d611cf6e8763b353f758d13c08
--- /dev/null
+++ b/gnulib/tests/test-EOVERFLOW.c
@@ -0,0 +1,32 @@
+/* Test of EOVERFLOW macro.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include <errno.h>
+
+/* Check that it can be used as an initializer outside of a function.  */
+static int err = EOVERFLOW;
+
+int
+main ()
+{
+  /* snprintf() callers want to distinguish EINVAL and EOVERFLOW.  */
+  if (err == EINVAL)
+    return 1;
+
+  return 0;
+}