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 17bffe25f6..8fc5b4e327 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -201,6 +201,7 @@
         <migration class="PKP\migration\upgrade\v3_6_0\I12772_UserCommentForeignKeys" />
 		<migration class="PKP\migration\upgrade\v3_6_0\I12584_AddPublicationUpdateType" />
         <migration class="PKP\migration\upgrade\v3_6_0\I12800_ReviewPublicationAssociationNullable" />
+		<migration class="PKP\migration\upgrade\v3_6_0\I12392_Funders" />
 		<code function="rebuildSearchIndex" />
 		<note file="docs/release-notes/README-3.6.0" />
 	</upgrade>
diff --git a/lib/pkp b/lib/pkp
index 0a52f0f935..cc94150953 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit 0a52f0f935d9d5f487f325845af902fc77427a31
+Subproject commit cc941509534179d56c3015a89310b129ef437f4c
diff --git a/lib/ui-library b/lib/ui-library
index 160a32d28b..5bead85694 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 160a32d28bb91bee61975c46460dc8cb481f209b
+Subproject commit 5bead856944c0accb954f339be2da1e4dc4c4f44
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'}