diff --git a/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec
index 2cf53f7c7e3..258493edf97 100644
--- a/make/data/jdwp/jdwp.spec
+++ b/make/data/jdwp/jdwp.spec
@@ -468,7 +468,7 @@ JDWP "Java(tm) Debug Wire Protocol"
         "<li>deleting a method</li>"
         "<li>changing class modifiers</li>"
         "<li>changing method modifiers</li>"
-        "<li>changing the <code>NestHost</code> or <code>NestMembers</code> class attributes</li>"
+        "<li>changing the <code>NestHost</code>, <code>NestMembers</code>, or <code>Record</code> class attributes</li>"
         "</ul>"
         "<p>"
         "Requires canRedefineClasses capability - see "
@@ -3167,8 +3167,8 @@ JDWP "Java(tm) Debug Wire Protocol"
                                           "than its counterpart in the old class version and "
                                           "canUnrestrictedlyRedefineClasses is false.")
     (Constant CLASS_ATTRIBUTE_CHANGE_NOT_IMPLEMENTED
-                                     =72  "The new class version has different NestHost or "
-                                          "NestMembers class attribute and "
+                                     =72  "The new class version has a different NestHost, "
+                                          "NestMembers, or Record class attribute and "
                                           "canUnrestrictedlyRedefineClasses is false.")
     (Constant NOT_IMPLEMENTED        =99  "The functionality is not implemented in "
                                           "this virtual machine.")
diff --git a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
index 364f318b939..f465a8cf3dc 100644
--- a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
@@ -226,8 +226,8 @@ public interface Instrumentation {
      * attributes (unless explicitly prohibited).
      * The retransformation must not add, remove or rename fields or methods, change the
      * signatures of methods, or change inheritance.
-     * The retransformation must not change the <code>NestHost</code> or
-     * <code>NestMembers</code> attributes.
+     * The retransformation must not change the <code>NestHost</code>,
+     * <code>NestMembers</code>, or <code>Record</code> attributes.
      * These restrictions may be lifted in future versions.
      * The class file bytes are not checked, verified and installed
      * until after the transformations have been applied, if the resultant bytes are in
@@ -317,8 +317,8 @@ public interface Instrumentation {
      * (unless explicitly prohibited).
      * The redefinition must not add, remove or rename fields or methods, change the
      * signatures of methods, or change inheritance.
-     * The redefinition must not change the <code>NestHost</code> or
-     * <code>NestMembers</code> attributes.
+     * The redefinition must not change the <code>NestHost</code>,
+     * <code>NestMembers</code>, or <code>Record</code> attributes.
      * These restrictions may be lifted in future versions.
      * The class file bytes are not checked, verified and installed
      * until after the transformations have been applied, if the resultant bytes are in
diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
index 46f4ba4d328..4e66e29f734 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -223,7 +223,7 @@ public interface VirtualMachine extends Mirror {
      *   <LI>deleting a method
      *   <LI>changing class modifiers
      *   <LI>changing method modifiers
-     *   <LI>changing the {@code NestHost} or {@code NestMembers} class attributes
+     *   <LI>changing the {@code NestHost}, {@code NestMembers}, or {@code Record} class attributes
      *   </UL>
      * </UL>
      *