diff --git a/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89458-ShowLinkToOnlineDocsInExtensionManager.rst b/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89458-ShowLinkToOnlineDocsInExtensionManager.rst
index 0a383c509c6b03e46c9fbb7951534faa200174a5..484fe90195e04c5e9bd1a9cbf4e0a400b4852ff0 100644
--- a/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89458-ShowLinkToOnlineDocsInExtensionManager.rst
+++ b/typo3/sysext/core/Documentation/Changelog/10.2/Feature-89458-ShowLinkToOnlineDocsInExtensionManager.rst
@@ -10,13 +10,17 @@ Description
 ===========
 
 The export of extensions provided by https://extensions.typo3.org has been extended with the link
-to the documentation of an extension. This link is now shown in the list of extension as well as the detail view
-of extensions in the extension manager.
+to the documentation of an extension. This link is now shown in all lists of extensions as well
+as the detail view of extensions in the extension manager.
 
+It is recommended that extension authors add documentation for their extensions on docs.typo3.org.
+
+However, if an extension provides an external documentation source, the custom link takes precedence
+over any existing documentation at docs.typo3.org.
 
 Impact
 ======
 
-Extension authors can add a custom link to the manual in their TER extensions which is now shown in the TYPO3 backend.
+Extension documentation links are now available in the extension manager.
 
 .. index:: Backend, ext:extensionmanager
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index 318cd3c2ab2a85b58ec8d3ae68cbcd150e450ef0..ee4617482ffcb79eac2e9b1cad0f80f687490e0c 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -90,6 +90,16 @@
                                 <core:icon identifier="actions-system-extension-download" />
                             </f:link.action>
                             <em:reloadSqlData class="btn btn-default" extension="{extension}" />
+                            <f:if condition="{extension.terObject.documentationLink}">
+                                <f:then>
+                                    <a href="{extension.terObject.documentationLink}" target="_blank" rel="noopener noreferrer" class="btn btn-default">
+                                        <core:icon identifier="actions-system-extension-documentation" size="small" />
+                                    </a>
+                                </f:then>
+                                <f:else>
+                                    <span class="btn btn-default disabled"><core:icon identifier="empty-empty" size="small" /></span>
+                                </f:else>
+                            </f:if>
                         </em:processAvailableActions>
                     </div>
                 </td>