diff --git a/api/v1/submissions/index.php b/api/v1/submissions/index.php
index 68804ed661..32c2f7fb8c 100644
--- a/api/v1/submissions/index.php
+++ b/api/v1/submissions/index.php
@@ -27,6 +27,8 @@
     return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\tasks\EditorialTaskController());
 } elseif (strpos($requestPath, '/dataCitations')) {
     return new \PKP\handler\APIHandler(new \PKP\API\v1\dataCitations\PKPDataCitationController());
+} elseif (strpos($requestPath, '/funders')) {
+    return new \PKP\handler\APIHandler(new \PKP\API\v1\funders\PKPFunderController());
 } elseif (strpos($requestPath, '/mediaFiles')) {
     return new \PKP\handler\APIHandler(new \PKP\API\v1\submissions\MediaFilesController());
 } else {
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 06551fec84..1fb9459ae4 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -169,6 +169,7 @@
 		<migration class="PKP\migration\upgrade\v3_6_0\I10403_EmailTemplateUserGroupAccess"/>
 		<migration class="APP\migration\install\ReviewerRecommendationsMigration"/>
 		<migration class="APP\migration\upgrade\v3_6_0\I1660_ReviewerRecommendations"/>
+		<migration class="PKP\migration\upgrade\v3_6_0\I12392_Funders" />
 		<migration class="APP\migration\upgrade\v3_6_0\I10404_UpdateCategoryImageNameFields"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationVersion"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationAddCreatedAt"/>
diff --git a/lib/pkp b/lib/pkp
index 1a5a8b1d7e..2e468a70b7 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 1a5a8b1d7e52ad079e4a669d4a6f3795cab9e61f
+Subproject commit 2e468a70b7f0a1bf887deb43aebad0bf1dce3170
diff --git a/lib/ui-library b/lib/ui-library
index 3f97137cef..1988c00397 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 3f97137cef11b99042ee8bcc96ff0dfe5dcf84e4
+Subproject commit 1988c0039783751772da3be406524ddf7e0f8b80
diff --git a/templates/frontend/objects/preprint_details.tpl b/templates/frontend/objects/preprint_details.tpl
index 317d92de61..6c1bc54f0e 100644
--- a/templates/frontend/objects/preprint_details.tpl
+++ b/templates/frontend/objects/preprint_details.tpl
@@ -476,6 +476,38 @@
 				</section>
 			{/if}
 
+			{* Funders *}
+			{if $publication->getData('funders')}
+			<section class="item funders" id="funding-data">
+				<h2 class="label">
+					{translate key="submission.funders"}
+				</h2>
+				<div class="value">
+					<ul>
+						{foreach from=$publication->getData('funders') item=funder}
+							<li>
+								<span class="funder">
+									{$funder->getLocalizedData('name')|escape}
+									{if $funder->ror}<a href="{$funder->ror|escape}">{$rorIdIcon}</a>{/if}
+								</span>
+								{if $funder->grants}
+									<ul>
+										{foreach from=$funder->grants item=grant}
+											<li>
+												{if $grant.grantName}<span>{$grant.grantName|escape}</span><br />{/if}
+												{if $grant.grantNumber}<span>{translate key="submission.funders.funder.grant.number"} {$grant.grantNumber|escape}</span><br />{/if}
+												{if $grant.grantDoi}<span>{translate key="submission.funders.funder.grant.doi"} <a href="https://doi.org/{$grant.grantDoi|escape}">https://doi.org/{$grant.grantDoi|escape}</a></span>{/if}
+											</li>
+										{/foreach}
+									</ul>
+								{/if}
+							</li>
+						{/foreach}
+					</ul>
+				</div>
+			</section>
+			{/if}
+
 			{* PubIds (requires plugins) *}
 			{foreach from=$pubIdPlugins item=pubIdPlugin}
 				{if $pubIdPlugin->getPubIdType() == 'doi'}