diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a62d79f4cae..670b06ccf47 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-21  Jason Merrill  <jason@redhat.com>
+
+	* c-common.c (max_tinst_depth): Increase default to 1024.
+
 2009-07-21  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/sse.md (vec_unpacku_float_hi_v4si): New expander.
diff --git a/gcc/c-common.c b/gcc/c-common.c
index 328e0fdae8e..aaa64351fd4 100644
--- a/gcc/c-common.c
+++ b/gcc/c-common.c
@@ -428,11 +428,11 @@ int flag_pretty_templates = 1;
 
 int warn_implicit = 1;
 
-/* Maximum template instantiation depth.  This limit is rather
-   arbitrary, but it exists to limit the time it takes to notice
-   infinite template instantiations.  */
+/* Maximum template instantiation depth.  This limit exists to limit the
+   time it takes to notice infinite template instantiations; the default
+   value of 1024 is likely to be in the next C++ standard.  */
 
-int max_tinst_depth = 500;
+int max_tinst_depth = 1024;