diff --git a/make/data/jdwp/jdwp.spec b/make/data/jdwp/jdwp.spec
index a3377b61a09..48d1aab3c15 100644
--- a/make/data/jdwp/jdwp.spec
+++ b/make/data/jdwp/jdwp.spec
@@ -461,16 +461,9 @@ JDWP "Java(tm) Debug Wire Protocol"
         "<a href=\"#JDWP_StackFrame_PopFrames\">PopFrames</a> command can be used "
         "to pop frames with obsolete methods."
         "<p>"
-        "Unless the canUnrestrictedlyRedefineClasses capability is present the following "
-        "redefinitions are restricted: "
-        "<ul>"
-        "<li>changing the schema (the fields)</li>"
-        "<li>changing the hierarchy (superclasses, interfaces)</li>"
-        "<li>deleting a method</li>"
-        "<li>changing class modifiers</li>"
-        "<li>changing method modifiers</li>"
-        "<li>changing the <code>NestHost</code>, <code>NestMembers</code>, or <code>Record</code> class attributes</li>"
-        "</ul>"
+        "Unless the canUnrestrictedlyRedefineClasses capability is present "
+        "the redefinition must follow the restrictions described in "
+        "<a href=\"../jvmti.html#RedefineClasses\">JVM TI RedefineClasses</a>."
         "<p>"
         "Requires canRedefineClasses capability - see "
         "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
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 8bd4163726c..06a5bc6bc7a 100644
--- a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
@@ -222,13 +222,8 @@ public interface Instrumentation {
      * Instances of the retransformed class are not affected.
      *
      * <P>
-     * The retransformation may change method bodies, the constant pool and
-     * 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>,
-     * <code>NestMembers</code>, or <code>Record</code> attributes.
-     * These restrictions may be lifted in future versions.
+     * The supported class file changes are described in
+     * <a href="{@docRoot}/../specs/jvmti.html#RetransformClasses">JVM TI RetransformClasses</a>.
      * The class file bytes are not checked, verified and installed
      * until after the transformations have been applied, if the resultant bytes are in
      * error this method will throw an exception.
@@ -313,13 +308,8 @@ public interface Instrumentation {
      * Instances of the redefined class are not affected.
      *
      * <P>
-     * The redefinition may change method bodies, the constant pool and attributes
-     * (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>,
-     * <code>NestMembers</code>, or <code>Record</code> attributes.
-     * These restrictions may be lifted in future versions.
+     * The supported class file changes are described in
+     * <a href="{@docRoot}/../specs/jvmti.html#RedefineClasses">JVM TI RedefineClasses</a>.
      * The class file bytes are not checked, verified and installed
      * until after the transformations have been applied, if the resultant bytes are in
      * error this method will throw an exception.
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 64281c70f34..21a77ce9a70 100644
--- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
+++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
@@ -214,17 +214,9 @@ public interface VirtualMachine extends Mirror {
      * attempting to add a method will throw this exception.
      * <LI>If {@link #canUnrestrictedlyRedefineClasses()
      *            canUnrestrictedlyRedefineClasses()}
-     * is false, attempting any of the following will throw
-     * this exception
-     *   <UL>
-     *   <LI>changing the schema (the fields)
-     *   <LI>changing the hierarchy (superclasses, interfaces)
-     *   <LI>deleting a method
-     *   <LI>changing class modifiers
-     *   <LI>changing method modifiers
-     *   <LI>changing the {@code NestHost}, {@code NestMembers}, or {@code Record} class attributes
-     *   </UL>
-     * </UL>
+     * is false attempting any of the unsupported class file changes described
+     * in <a href="{@docRoot}/../specs/jvmti.html#RedefineClasses">
+     * JVM TI RedefineClasses</a> will throw this exception.
      *
      * @throws java.lang.NoClassDefFoundError if the bytes
      * don't correspond to the reference type (the names