diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9087092f4d4..bde6cbf1217 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-10  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/22_locale/locale/cons/12438.cc: Tweak memory
+	limit and iterations to avoid spurious failures on some
+	64 bit machines.
+
 2003-12-09  Benjamin Kosnik  <bkoz@redhat.com>
 	
 	* config/linker-map.gnu: Remove private ios_base members from
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
index c9129993c7b..70691d320e4 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
@@ -57,8 +57,8 @@ void test01(int iters)
 int main(int argc, char* argv[])
 {
   // We leaked ~400-500 bytes/iter.
-  __gnu_test::set_memory_limits(5.0);
-  int iters = 20000;
+  __gnu_test::set_memory_limits(10.0);
+  int iters = 30000;
 
   if (argc > 1)
     iters = atoi(argv[1]);