diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 50f1884afec..ef1556be8fe 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -5165,10 +5165,10 @@ END;
 $$;
 
 SELECT foo();
-WARNING:  number of source and target fields in assignment do not match
+WARNING:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_warnings is active.
 HINT:  Make sure the query returns the exact list of columns.
-WARNING:  number of source and target fields in assignment do not match
+WARNING:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_warnings is active.
 HINT:  Make sure the query returns the exact list of columns.
 
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 23aed02dbd7..1b1d87e59ae 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -6993,7 +6993,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
 					if (strict_multiassignment_level)
 							ereport(strict_multiassignment_level,
 									(errcode(ERRCODE_DATATYPE_MISMATCH),
-									 errmsg("number of source and target fields in assignment do not match"),
+									 errmsg("number of source and target fields in assignment does not match"),
 									 /* translator: %s represents a name of an extra check */
 									 errdetail("%s check of %s is active.",
 											   "strict_multi_assignment",
@@ -7027,7 +7027,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
 				if (anum < td_natts)
 					ereport(strict_multiassignment_level,
 							(errcode(ERRCODE_DATATYPE_MISMATCH),
-							 errmsg("number of source and target fields in assignment do not match"),
+							 errmsg("number of source and target fields in assignment does not match"),
 							 /* translator: %s represents a name of an extra check */
 							 errdetail("%s check of %s is active.",
 									   "strict_multi_assignment",
@@ -7101,7 +7101,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
 				if (strict_multiassignment_level)
 						ereport(strict_multiassignment_level,
 								(errcode(ERRCODE_DATATYPE_MISMATCH),
-								 errmsg("number of source and target fields in assignment do not match"),
+								 errmsg("number of source and target fields in assignment does not match"),
 						 /* translator: %s represents a name of an extra check */
 						 errdetail("%s check of %s is active.",
 								  "strict_multi_assignment",
@@ -7127,7 +7127,7 @@ exec_move_row_from_fields(PLpgSQL_execstate *estate,
 			if (anum < td_natts)
 				ereport(strict_multiassignment_level,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("number of source and target fields in assignment do not match"),
+						 errmsg("number of source and target fields in assignment does not match"),
 						 /* translator: %s represents a name of an extra check */
 						 errdetail("%s check of %s is active.",
 								  "strict_multi_assignment",
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 5613a465e9e..e85b29455e5 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -2899,10 +2899,10 @@ begin
   select 1,2,3 into x, y;
 end
 $$;
-WARNING:  number of source and target fields in assignment do not match
+WARNING:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_warnings is active.
 HINT:  Make sure the query returns the exact list of columns.
-WARNING:  number of source and target fields in assignment do not match
+WARNING:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_warnings is active.
 HINT:  Make sure the query returns the exact list of columns.
 set plpgsql.extra_errors to 'strict_multi_assignment';
@@ -2916,7 +2916,7 @@ begin
   select 1,2,3 into x, y;
 end
 $$;
-ERROR:  number of source and target fields in assignment do not match
+ERROR:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_errors is active.
 HINT:  Make sure the query returns the exact list of columns.
 CONTEXT:  PL/pgSQL function inline_code_block line 6 at SQL statement
@@ -2935,7 +2935,7 @@ begin
 end;
 $$;
 NOTICE:  ok
-ERROR:  number of source and target fields in assignment do not match
+ERROR:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_errors is active.
 HINT:  Make sure the query returns the exact list of columns.
 CONTEXT:  PL/pgSQL function inline_code_block line 8 at SQL statement
@@ -2949,7 +2949,7 @@ begin
 end;
 $$;
 NOTICE:  ok
-ERROR:  number of source and target fields in assignment do not match
+ERROR:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_errors is active.
 HINT:  Make sure the query returns the exact list of columns.
 CONTEXT:  PL/pgSQL function inline_code_block line 7 at SQL statement
@@ -2960,7 +2960,7 @@ begin
   select 1 into t; -- should fail;
 end;
 $$;
-ERROR:  number of source and target fields in assignment do not match
+ERROR:  number of source and target fields in assignment does not match
 DETAIL:  strict_multi_assignment check of extra_errors is active.
 HINT:  Make sure the query returns the exact list of columns.
 CONTEXT:  PL/pgSQL function inline_code_block line 5 at SQL statement