diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1cb628dadc9..42609eb7164 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-16  Hans-Peter Nilsson  <hp@axis.com>
+
+	* cp-tree.h (VFIELD_NAME_FORMAT) [NO_DOLLAR_IN_LABEL &&
+	NO_DOT_IN_LABEL]: Adjust to match VFIELD_NAME.
+
 2001-10-15  Richard Sandiford  <rsandifo@redhat.com>
 
 	* pt.c (UNIFY_ALLOW_MAX_CORRECTION): Define.
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 34ef95a493a..e65a4de0be5 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3167,7 +3167,7 @@ extern varray_type local_classes;
 #define VFIELD_NAME_P(ID_NODE) \
   (!strncmp (IDENTIFIER_POINTER (ID_NODE), VFIELD_NAME, \
 	    sizeof (VFIELD_NAME) - 1))
-#define VFIELD_NAME_FORMAT "_vptr_%s"
+#define VFIELD_NAME_FORMAT "__vptr_%s"
 #define STATIC_NAME_FORMAT "__static_%s_%s"
 
 #define ANON_AGGRNAME_PREFIX "__anon_"