diff --git a/ChangeLog b/ChangeLog
index f56e240954..c32f27ac7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-17  Chris Metcalf  <cmetcalf@tilera.com>
+
+	* stdio-common/bug22.c (TIMEOUT): Bump up from 30 to 60.
+
 2012-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/x86_64/Makefile (tests): Add tst-mallocalign1.
diff --git a/stdio-common/bug22.c b/stdio-common/bug22.c
index efd9501368..b26399acb7 100644
--- a/stdio-common/bug22.c
+++ b/stdio-common/bug22.c
@@ -51,6 +51,6 @@ do_test (void)
   return ret != -1 || errno != EOVERFLOW;
 }
 
-#define TIMEOUT 30
+#define TIMEOUT 60
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"