diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index d4e968e5bc5..bc9abc1f175 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-10  Tobias Burnus  <burnus@net-b.de>
+
+	* resolve.c (resolve_ordinary_assign): Improve error wording.
+
 2012-01-09  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/51791
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index c48e2b19e65..1c5fea3752c 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -9208,8 +9208,8 @@ resolve_ordinary_assign (gfc_code *code, gfc_namespace *ns)
      and coindexed; cf. F2008, 7.2.1.2 and PR 43366.  */
   if (lhs->ts.type == BT_CLASS)
     {
-      gfc_error ("Variable must not be polymorphic in assignment at %L "
-		 "- check that there is a matching specific subroutine "
+      gfc_error ("Variable must not be polymorphic in intrinsic assignment at "
+		 "%L - check that there is a matching specific subroutine "
 		 "for '=' operator", &lhs->where);
       return false;
     }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02e8b55f758..a6df9b0fc33 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-10  Tobias Burnus  <burnus@net-b.de>
+
+	* gfortran.dg/class_39.f03: Update dg-error string.
+
 2012-01-10  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/50913
diff --git a/gcc/testsuite/gfortran.dg/class_39.f03 b/gcc/testsuite/gfortran.dg/class_39.f03
index bc8039fc0c5..6fe762ba35d 100644
--- a/gcc/testsuite/gfortran.dg/class_39.f03
+++ b/gcc/testsuite/gfortran.dg/class_39.f03
@@ -8,6 +8,6 @@
   end type T
 contains
   class(T) function add()  ! { dg-error "must be dummy, allocatable or pointer" }
-    add = 1  ! { dg-error "Variable must not be polymorphic in assignment" }
+    add = 1  ! { dg-error "Variable must not be polymorphic in intrinsic assignment" }
   end function
 end