diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index 310b78c6bd3107e9191a14c07197e4716c5cb003..6e9517ca477ffc1bff2cac318d0d683a2570c9d5 100755
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.95 2007/11/16 01:11:04 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/pgindent/pgindent,v 1.96 2007/11/16 01:25:15 momjian Exp $
 
 # Known bugs:
 #
@@ -46,10 +46,10 @@ do
 # 'else' followed by a single-line comment, followed by
 # a brace on the next line confuses BSD indent, so we push
 # the comment down to the next line, then later pull it
-# back up again.  Add space before PGMV or indent will add
+# back up again.  Add space before _PGMV or indent will add
 # it for us.
 	sed 's;\([} 	]\)else[ 	]*\(/\*\)\(.*\*/\)[ 	]*$;\1else\
-    \2 PGMV\3;g' |
+    \2 _PGMV\3;g' |
 
 # Indent multi-line after-'else' comment so BSD indent will move it properly.
 # We already moved down single-line comments above.  Check for '*' to make
@@ -2244,10 +2244,10 @@ do
 		{
 			if (NR != 1)
 			{
-				if ($0 ~ "/\* PGMV")
+				if ($0 ~ "/\* _PGMV")
 				{
 					# remove tag
-					sub(" PGMV", "", $0);
+					sub(" _PGMV", "", $0);
 					# remove leading whitespace
 					sub("^[ 	]*", "", $0);
 					# add comment with single tab prefix