diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5e4e82433436..60bfd419ddfc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13310
+	* pt.c (dependent_template_p): Handle OVERLOADs.
+
 2003-12-15  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/13243
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 553d4f7d3183..1a03bba6b89e 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -11912,6 +11912,17 @@ any_dependent_template_arguments_p (tree args)
 bool
 dependent_template_p (tree tmpl)
 {
+  if (TREE_CODE (tmpl) == OVERLOAD)
+    {
+      while (tmpl)
+	{
+	  if (dependent_template_p (OVL_FUNCTION (tmpl)))
+	    return true;
+	  tmpl = OVL_CHAIN (tmpl);
+	}
+      return false;
+    }
+
   /* Template template parameters are dependent.  */
   if (DECL_TEMPLATE_TEMPLATE_PARM_P (tmpl)
       || TREE_CODE (tmpl) == TEMPLATE_TEMPLATE_PARM)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 679637a3c04c..941809d2c613 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-15  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/13310
+	* g++.dg/template/crash15.C: New test.
+
 2003-12-15  Geoffrey Keating  <geoffk@apple.com>
 
 	* g++.old-deja/g++.pt/vaarg3.C: Don't expect an error for passing
diff --git a/gcc/testsuite/g++.dg/template/crash15.C b/gcc/testsuite/g++.dg/template/crash15.C
new file mode 100644
index 000000000000..e0aad73c73e6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/crash15.C
@@ -0,0 +1,9 @@
+// PR c++/13310
+
+struct A {};
+
+template <typename> void foo()
+{
+    A a;
+    a.foo<int>(); // { dg-error "" }
+}