diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 06d51594bb8..dad97add6c4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-25  Jason Merrill  <jason@redhat.com>
 
+	PR c++/48599
+	* decl.c (create_array_type_for_decl): Complain about array of auto.
+
 	PR c++/44944
 	PR c++/49156
 	* error.c (dump_template_bindings): Set processing_template_decl
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d53fa26c68a..58cab51ab81 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7974,6 +7974,12 @@ create_array_type_for_decl (tree name, tree type, tree size)
   if (type == error_mark_node || size == error_mark_node)
     return error_mark_node;
 
+  /* 8.3.4/1: If the type of the identifier of D contains the auto
+     type-specifier, the program is ill-formed.  */
+  if (pedantic && type_uses_auto (type))
+    pedwarn (input_location, OPT_pedantic,
+	     "declaration of %qD as array of %<auto%>", name);
+
   /* If there are some types which cannot be array elements,
      issue an error-message and return.  */
   switch (TREE_CODE (type))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 07f4845ee01..bcef9a9df22 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-25  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/cpp0x/auto24.C: New.
+
 	* g++.dg/cpp0x/error4.C: New.
 
 	* g++.dg/cpp0x/rv-restrict.C: New.
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto24.C b/gcc/testsuite/g++.dg/cpp0x/auto24.C
new file mode 100644
index 00000000000..b024ad5b2ab
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/auto24.C
@@ -0,0 +1,5 @@
+// PR c++/48599
+// { dg-options "-std=c++0x -pedantic-errors" }
+
+int v[1];
+auto (*p)[1] = &v;		// { dg-error "array of .auto" }