diff --git a/tck/pom.xml b/tck/pom.xml
index 8df9063..b7fb0a8 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -34,6 +34,7 @@
         <module>tck-common</module>
         <module>tck-tests</module>
         <module>tck-tests-plugability</module>
+        <module>tck-docs/userguide</module>
         <module>tck-dist</module>
     </modules>
 
diff --git a/tck/tck-dist/src/main/assembly/assembly.xml b/tck/tck-dist/src/main/assembly/assembly.xml
index 325f379..ec03e0d 100644
--- a/tck/tck-dist/src/main/assembly/assembly.xml
+++ b/tck/tck-dist/src/main/assembly/assembly.xml
@@ -34,7 +34,40 @@
          <source>artifact-install.sh</source>
          <outputDirectory>artifacts</outputDirectory>
       </file>
+      <file>
+         <source>../tck-docs/userguide/target/generated-docs/Jakarta-JSON-Processing-TCK-Users-Guide.pdf</source>
+         <outputDirectory>docs/pdf-usersguide</outputDirectory>
+      </file>
+      <file>
+         <source>../tck-docs/index.html</source>
+         <outputDirectory>docs/</outputDirectory>
+      </file>
+      <file>
+         <source>../tck-docs/JSONP2.1-ReleaseNotes.html</source>
+         <outputDirectory>docs/</outputDirectory>
+      </file>
    </files>
+
+   <fileSets>
+        <fileSet>
+            <directory>../tck-docs/assertions</directory>
+            <outputDirectory>/docs/assertions</outputDirectory>
+            <includes>
+                <include>JSONP*avadocAssertions.html</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>../tck-docs/userguide/target/staging</directory>
+            <outputDirectory>docs/html-usersguide</outputDirectory>
+            <excludes>
+               <exclude>*.inc</exclude>
+               <exclude>*.conf</exclude>
+               <exclude>*.yml</exclude>
+               <exclude>*.md</exclude>
+               <exclude>README</exclude>
+            </excludes>
+        </fileSet>
+   </fileSets>
    <dependencySets>
       <dependencySet>
          <includes>
diff --git a/tck/tck-docs/JSONP2.1-ReleaseNotes.html b/tck/tck-docs/JSONP2.1-ReleaseNotes.html
index 4a6421c..f2150d7 100644
--- a/tck/tck-docs/JSONP2.1-ReleaseNotes.html
+++ b/tck/tck-docs/JSONP2.1-ReleaseNotes.html
@@ -95,7 +95,7 @@
     <hr>
     <h2><a name="install_setup_run">Installing, Setting Up, and Running the
         JSON-P TCK</a></h2>
-    <p>Refer to the <cite><a href="html-usersguide/title.html">JSON-P TCK 2.0
+    <p>Refer to the <cite><a href="html-usersguide/title.html">JSON-P TCK 2.1
           User's Guide</a></cite> (or <a href="./pdf-usersguide/Jakarta-JSON-Processing-TCK-Users-Guide.pdf"
 
         title="Jakarta EE JSON Processing 2.1 TCK User's Guide (PDF)">PDF</a>)
diff --git a/tck/tck-docs/index.html b/tck/tck-docs/index.html
index 12d35eb..1d6fbfe 100644
--- a/tck/tck-docs/index.html
+++ b/tck/tck-docs/index.html
@@ -53,9 +53,9 @@
             Specification web site for Jakarta EE JSON Processing: <a href="https://jakarta.ee/specifications/jsonp/2.1/">https://jakarta.ee/specifications/jsonp/2.1/</a></li>
         </ul>
       </li>
-      <li>The <em><a href="tck-docs/userguide/target/generated-docs/toc.html">Jakarta EE JSON Processing
+      <li>The <em><a href="html-usersguide/toc.html">Jakarta EE JSON Processing
             Technology Compatibility Kit, Version 2.1 User's Guide</a></em> (or
-        <a href="tck-docs/userguide/target/generated-docs/Jakarta-JSON-Processing-TCK-Users-Guide.pdf"
+        <a href="pdf-usersguide/Jakarta-JSON-Processing-TCK-Users-Guide.pdf"
 
           title="Jakarta EE JSON Processing TCK 2.1 User's Guide (PDF)">PDF</a>)
         provides the information that you need to install, set up, and run the