diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 19bbfed52602..ebb636e59598 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-12-07  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/51401
+	* decl.c (grokdeclarator): Error for auto on non-static data members.
+
 	PR c++/51429
 	* typeck2.c (cxx_incomplete_type_diagnostic): Don't
 	ICE if TREE_OPERAND (value, 1) is overloaded.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 07cc9e65f5e4..5a4e0270957d 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -9971,6 +9971,12 @@ grokdeclarator (const cp_declarator *declarator,
       }
     else if (decl_context == FIELD)
       {
+	if (!staticp && type_uses_auto (type))
+	  {
+	    error ("non-static data member declared %<auto%>");
+	    type = error_mark_node;
+	  }
+
 	/* The C99 flexible array extension.  */
 	if (!staticp && TREE_CODE (type) == ARRAY_TYPE
 	    && TYPE_DOMAIN (type) == NULL_TREE)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e95eb496c86f..31b2d2e37fc4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2011-12-07  Jakub Jelinek  <jakub@redhat.com>
 
+	PR c++/51401
+	* g++.dg/cpp0x/auto7.C: Adjust expected error message.
+	* g++.dg/cpp0x/auto29.C: New test.
+
 	PR c++/51429
 	* g++.dg/parse/error45.C: New test.
 
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto29.C b/gcc/testsuite/g++.dg/cpp0x/auto29.C
new file mode 100644
index 000000000000..818745751a89
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/auto29.C
@@ -0,0 +1,25 @@
+// PR c++/51401
+// { dg-do compile }
+// { dg-options "-std=c++11" }
+
+template <int>
+struct A
+{
+  auto i;	// { dg-error "non-static data member declared" }
+};
+
+template <int>
+struct B
+{
+  auto i = 0;	// { dg-error "non-static data member declared" }
+};
+
+struct C
+{
+  auto i;	// { dg-error "non-static data member declared" }
+};
+
+struct D
+{
+  auto i = 0;	// { dg-error "non-static data member declared" }
+};
diff --git a/gcc/testsuite/g++.dg/cpp0x/auto7.C b/gcc/testsuite/g++.dg/cpp0x/auto7.C
index e7ab7236d059..3b3b82901681 100644
--- a/gcc/testsuite/g++.dg/cpp0x/auto7.C
+++ b/gcc/testsuite/g++.dg/cpp0x/auto7.C
@@ -9,5 +9,5 @@ template<int> struct A
 {
   static auto k = 7;	// { dg-error "non-const" }
   static auto l;	// { dg-error "has no initializer" }
-  auto m;		// { dg-error "has no initializer" }
+  auto m;		// { dg-error "non-static data member declared" }
 };