diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 171c52a1c4c..5e42ff59aee 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2013-03-16  Jason Merrill  <jason@redhat.com>
 
+	PR c++/45917
+	* parser.c (cp_parser_template_id): Don't forget access checks.
+
 	PR c++/52374
 	* pt.c (tsubst_qualified_id): Use current_nonlambda_class_type.
 
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 66684dc9fd1..47ff995ed34 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -12818,7 +12818,7 @@ cp_parser_template_id (cp_parser *parser,
 	error_at (token->location, "parse error in template argument list");
     }
 
-  pop_deferring_access_checks ();
+  pop_to_parent_deferring_access_checks ();
   return template_id;
 }
 
diff --git a/gcc/testsuite/g++.dg/template/access26.C b/gcc/testsuite/g++.dg/template/access26.C
new file mode 100644
index 00000000000..1c5de9a8fd2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/access26.C
@@ -0,0 +1,6 @@
+// PR c++/45917
+
+template < typename T >
+struct A { static int i; };
+class B { typedef int X; };	// { dg-error "private" }
+void f() { A<B::X>::i = 0; }	// { dg-error "this context" }