diff --git a/resources/key-definitions.ditamap b/resources/key-definitions.ditamap
index 3dce48a81..a1cfc143e 100644
--- a/resources/key-definitions.ditamap
+++ b/resources/key-definitions.ditamap
@@ -43,7 +43,7 @@
   <keydef keys="tool.ant.version">
     <topicmeta>
       <keywords>
-        <keyword>1.9.4</keyword>
+        <keyword>1.9.7</keyword>
       </keywords>
     </topicmeta>
   </keydef>
@@ -55,11 +55,27 @@
       </keywords>
     </topicmeta>
   </keydef>
-  <!-- Codec: Bundled version -->
+  <!-- Apache Commons Codec: Bundled version -->
   <keydef keys="tool.codec.version">
     <topicmeta>
       <keywords>
-        <keyword>1.9</keyword>
+        <keyword>1.10</keyword>
+      </keywords>
+    </topicmeta>
+  </keydef>
+  <!-- Apache Commons IO: Bundled version -->
+  <keydef keys="tool.io.version">
+    <topicmeta>
+      <keywords>
+        <keyword>2.5</keyword>
+      </keywords>
+    </topicmeta>
+  </keydef>
+  <!-- Guava: Bundled version -->
+  <keydef keys="tool.guava.version">
+    <topicmeta>
+      <keywords>
+        <keyword>19.0</keyword>
       </keywords>
     </topicmeta>
   </keydef>
@@ -67,7 +83,7 @@
   <keydef keys="tool.icu4j.version">
     <topicmeta>
       <keywords>
-        <keyword>54.1</keyword>
+        <keyword>57.1</keyword>
       </keywords>
     </topicmeta>
   </keydef>
@@ -103,11 +119,19 @@
       </keywords>
     </topicmeta>
   </keydef>
-  <!-- Resolver: Bundled version-->
+  <!-- XML APIs: Bundled version-->
+  <keydef keys="tool.xmlapis.version">
+    <topicmeta>
+      <keywords>
+        <keyword>1.4.01</keyword>
+      </keywords>
+    </topicmeta>
+  </keydef>
+  <!-- XML Resolver: Bundled version-->
   <keydef keys="tool.resolver.version">
     <topicmeta>
       <keywords>
-        <keyword>1.1</keyword>
+        <keyword>1.2</keyword>
       </keywords>
     </topicmeta>
   </keydef>
diff --git a/user-guide/third-party-software.dita b/user-guide/third-party-software.dita
index 4bc56aed1..6c1fd9ec1 100644
--- a/user-guide/third-party-software.dita
+++ b/user-guide/third-party-software.dita
@@ -25,57 +25,57 @@
           <tbody>
             <row>
               <entry>Ant</entry>
-              <entry>1.9.7</entry>
+              <entry><keyword keyref="tool.ant.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/>
               </entry>
             </row>
             <row>
               <entry>Apache Commons Codec</entry>
-              <entry>1.10</entry>
+              <entry><keyword keyref="tool.codec.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/></entry>
             </row>
             <row>
               <entry>Apache Commons IO</entry>
-              <entry>2.5</entry>
+              <entry><keyword keyref="tool.io.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/></entry>
             </row>
             <row>
               <entry>Guava</entry>
-              <entry>19.0</entry>
+              <entry><keyword keyref="tool.guava.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/></entry>
             </row>
             <row>
               <entry>ICU4J</entry>
-              <entry>57.1</entry>
+              <entry><keyword keyref="tool.icu4j.version"/></entry>
               <entry>
                 <xref keyref="license-ICU"/></entry>
             </row>
             <row>
               <entry>Saxon</entry>
-              <entry>9.1.0.8</entry>
+              <entry><keyword keyref="tool.saxon.version"/></entry>
               <entry>
                 <xref keyref="license-MPL"/></entry>
             </row>
             <row>
               <entry>Xerces</entry>
-              <entry>2.11.0</entry>
+              <entry><keyword keyref="tool.xerces.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/></entry>
             </row>
             <row>
               <entry>XML APIs</entry>
-              <entry>1.4.01</entry>
+              <entry><keyword keyref="tool.xmlapis.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/>,
                 <xref keyref="license-W3C"/></entry>
             </row>
             <row>
               <entry>XML Resolver</entry>
-              <entry>1.2</entry>
+              <entry><keyword keyref="tool.resolver.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/></entry>
             </row>
@@ -127,7 +127,7 @@
             </row>
             <row>
               <entry>FOP</entry>
-              <entry>2.1</entry>
+              <entry><keyword keyref="tool.fop.version"/></entry>
               <entry>
                 <xref keyref="license-apache-2"/></entry>
             </row>