diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 8e338aaa9f..a8bae64193 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -168,6 +168,7 @@
 		<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationAddCreatedAt"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I4860_MigratePublicationVersionSourcePublicationId"/>
 		<migration class="PKP\migration\upgrade\v3_6_0\I11326_UserComments"/>
+		<migration class="PKP\migration\upgrade\v3_6_0\I857_CreditRoles"/>
 		<note file="docs/release-notes/README-3.6.0" />
 	</upgrade>
 
diff --git a/lib/pkp b/lib/pkp
index d40ab58d3b..2be77f2f00 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit d40ab58d3bb25240acbac0d7c3dd058e705fa5fb
+Subproject commit 2be77f2f00c066ffc96e8d45f394f79535da334d
diff --git a/lib/ui-library b/lib/ui-library
index 77c0c66190..6179eefb98 160000
--- a/lib/ui-library
+++ b/lib/ui-library
@@ -1 +1 @@
-Subproject commit 77c0c661905ec978972390022b9c195fd958899b
+Subproject commit 6179eefb98bddd827db5aa604ac46bbd01f00892
diff --git a/pages/preprint/PreprintHandler.php b/pages/preprint/PreprintHandler.php
index 422c5eed53..a52e555b85 100644
--- a/pages/preprint/PreprintHandler.php
+++ b/pages/preprint/PreprintHandler.php
@@ -271,6 +271,11 @@ public function view($args, $request)
             'parsedCitations' => $publication->getData('citations'),
         ]);
 
+        // Credit Role Terms
+        $templateMgr->assign([
+            'creditRoleTerms' => Repo::CreditRole()->getTerms(),
+        ]);
+
         // Assign deprecated values to the template manager for
         // compatibility with older themes
         $templateMgr->assign([
diff --git a/plugins/themes/default/styles/objects/preprint_details.less b/plugins/themes/default/styles/objects/preprint_details.less
index ae1533d13a..83e0f0da3b 100755
--- a/plugins/themes/default/styles/objects/preprint_details.less
+++ b/plugins/themes/default/styles/objects/preprint_details.less
@@ -107,6 +107,12 @@
 				vertical-align: middle;
 			}
 		}
+
+		.credit_roles {
+			display: block;
+			font-size: @font-sml;
+			line-height: @double;
+		}
 	}
 
 	.author_bios {
diff --git a/templates/frontend/objects/preprint_details.tpl b/templates/frontend/objects/preprint_details.tpl
index 706f560c58..d0dbb359ff 100644
--- a/templates/frontend/objects/preprint_details.tpl
+++ b/templates/frontend/objects/preprint_details.tpl
@@ -64,6 +64,7 @@
  * @uses $licenseUrl string URL to license. Only assigned if license should be
  *   included with published submissions.
  * @uses $ccLicenseBadge string An image and text with details about the license
+ * @uses $creditRoleTerms Array of translated credit role terms: roles and degrees
  *}
 <article class="obj_preprint_details">
 
@@ -151,6 +152,21 @@
 									</a>
 								</span>
 							{/if}
+							{if $author->getData('creditRoles')}
+								<span class="credit_roles">
+								{strip}
+								{foreach $author->getData('creditRoles') as $credit}
+									<span class="value">
+										{$creditRoleTerms.roles[$credit.role]|escape}
+										{if $creditRoleTerms.degrees[$credit.degree]}
+											&nbsp;({$creditRoleTerms.degrees[$credit.degree]|escape})
+										{/if}
+									</span>
+									{if !$credit@last}{translate key="common.commaListSeparator"}{/if}
+								{/foreach}
+								{/strip}
+								</span>
+							{/if}
 						</li>
 					{/foreach}
 					</ul>