diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index aa2d2f51c362..34359f01fde2 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-10  Jason Merrill  <jason@redhat.com>
+
+	PR c++/48736
+	* pt.c (tsubst_copy_and_build): Handle substitution of a pack
+	expansion producing another expansion.
+
 2011-05-10  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	Fixes for override/final.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index f6392d63b818..5e2497796fd1 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13250,7 +13250,8 @@ tsubst_copy_and_build (tree t,
                 ce->value = tsubst_pack_expansion (ce->value, args, complain,
                                                   in_decl);
 
-		if (ce->value == error_mark_node)
+		if (ce->value == error_mark_node
+		    || PACK_EXPANSION_P (ce->value))
 		  ;
 		else if (TREE_VEC_LENGTH (ce->value) == 1)
                   /* Just move the argument into place.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e133d9d7da00..4a63e60e1446 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-10  Jason Merrill  <jason@redhat.com>
+
+	* g++.dg/cpp0x/variadic108.C: New.
+
 2011-05-10  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
 	* g++.dg/inherit/virtual9.C: Extend.
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic108.C b/gcc/testsuite/g++.dg/cpp0x/variadic108.C
new file mode 100644
index 000000000000..3ad5af457175
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic108.C
@@ -0,0 +1,10 @@
+// PR c++/48736
+// { dg-options -std=c++0x }
+
+template<class T>
+T&& create();
+
+template<class T, class... Args,
+ class = decltype(T{create<Args>()...}) // Line X
+>
+char f(int);