diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
index 4b6609ef4e..5955d944e1 100644
--- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
+++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed
@@ -677,7 +677,8 @@
   </xed:template>
 
   <xed:template id="person.affiliation">
-    <mir:textfield repeat="true" xpath="mods:affiliation" help-text="{i18n:mir.help.affiliation}" label="mir.affiliation" />
+    <mir:textfield repeat="true" xpath="mods:affiliation[not(@authorityURI)]" help-text="{i18n:mir.help.affiliation}" label="mir.affiliation" />
+    <mir:textfield repeat="true" xpath="mods:affiliation[@authorityURI='https://ror.org/']" help-text="{i18n:mir.help.affiliation.ror}" label="mir.affiliation.ror" />
   </xed:template>
 
   <xed:template id="nameIdentifier.repeated">
diff --git a/mir-module/src/main/resources/config/mir/messages_de.properties b/mir-module/src/main/resources/config/mir/messages_de.properties
index 66b3b81b92..e730902f08 100644
--- a/mir-module/src/main/resources/config/mir/messages_de.properties
+++ b/mir-module/src/main/resources/config/mir/messages_de.properties
@@ -239,6 +239,7 @@ mir.actions.noaccess                            = Um das Dokument zu bearbeiten,
 mir.actions.norights                            = Sie besitzen nicht die ben\u00F6tigten Rechte, um das Dokument zu bearbeiten.
 mir.admineditor                                 = Bearbeiten im Admin-Editor
 mir.affiliation                                 = Zugeh\u00F6rigkeit
+mir.affiliation.ror                             = ROR
 mir.articlenumber                               = Artikelnummer:
 mir.articlenumber.short                         = Art.-Nr.:
 mir.breadcrumb.home                             = Start
@@ -384,6 +385,7 @@ mir.help.abstract.language                      = Geben Sie die Sprache an, in d
 mir.help.abstract.ortext                        = Eine kurze Zusammenfassung des Dokumentinhalts.
 mir.help.access                                 = Geben Sie hier an, wer auf die angehangenen Dokumente zugreifen darf.
 mir.help.affiliation                            = Organisation bzw. Institution der betreffenden Person.
+mir.help.affiliation.ror = <a href="https://ror.org/">ROR ID</a> der Organisation bzw. Institution der betreffenden Person.
 mir.help.articlenumber                          = Die Nummer eines Artikels, der in einer Online-Zeitschrift oder auf einer Publikationsplattform erschienen ist.
 mir.help.artist.photographer                    = K\u00FCnstler des Werkes oder Fotograf des Bildes.
 mir.help.authorSpecification                    = Genauere Beschreibung der Autor(innen)-Rolle, meist relevant f\u00C3\u00BCr Kontaktaufnahme oder statistische Auswertungen.
diff --git a/mir-module/src/main/resources/config/mir/messages_en.properties b/mir-module/src/main/resources/config/mir/messages_en.properties
index 3e78c44add..0280df13b9 100644
--- a/mir-module/src/main/resources/config/mir/messages_en.properties
+++ b/mir-module/src/main/resources/config/mir/messages_en.properties
@@ -226,6 +226,7 @@ mir.actions.noaccess                           = To edit the document, please lo
 mir.actions.norights                           = You don't have the rights to edit the document.
 mir.admineditor                                = Edit in admin editor
 mir.affiliation                                = Affiliation
+mir.affiliation.ror                            = ROR
 mir.articlenumber                              = Article number:
 mir.articlenumber.short                        = Art.-No.:
 mir.breadcrumb.home                            = Home
@@ -362,6 +363,7 @@ mir.help.abstract.aslink                       = Weblink to abstract.
 mir.help.abstract.ortext                       = A short summary of the document content.
 mir.help.access                                = Specify who should be able to access the dataset after publication. The metadata will be public in any case.
 mir.help.affiliation                           = Organisation/Affiliation of the Person.
+mir.help.affiliation.ror = <a href="https://ror.org/">ROR ID</a> of the Organisation/Affiliation of the Person.
 mir.help.articlenumber                         = The number of an article published in an online journal or publication platform.
 mir.help.artist.photographer                   = Creator of the Picture/Image.
 mir.help.author.interviewee                    = A person, family or organization responsible for creating or contributing to a resource by responding to an interviewer, usually a reporter, pollster, or some other information gathering agent.
diff --git a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
index 6194732fd3..9e664ec9b3 100644
--- a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
@@ -165,6 +165,12 @@
     </xsl:copy>
   </xsl:template>
 
+  <xsl:template match="mods:affiliation[@authorityURI='https://ror.org/'][@valueURI]">
+    <mods:affiliation authorityURI="{@authorityURI}">
+      <xsl:value-of select="substring-after(@valueURI, @authorityURI)"/>
+    </mods:affiliation>
+  </xsl:template>
+
   <!-- Remove this mods:classification entry, will be created again while saving using mods:accessCondtition (see MIR-161) -->
   <xsl:template match="mods:classification[@authority='accessRestriction']">
     <!-- do nothing -->
diff --git a/mir-module/src/main/resources/xsl/editor/xeditor2mods.xsl b/mir-module/src/main/resources/xsl/editor/xeditor2mods.xsl
index f1aeec434f..3f1a507843 100644
--- a/mir-module/src/main/resources/xsl/editor/xeditor2mods.xsl
+++ b/mir-module/src/main/resources/xsl/editor/xeditor2mods.xsl
@@ -155,6 +155,10 @@
     </mods:nameIdentifier>
   </xsl:template>
 
+  <xsl:template match="mods:affiliation[@authorityURI='https://ror.org/']">
+    <mods:affiliation authorityURI="{@authorityURI}" valueURI="{@authorityURI}{.}"/>
+  </xsl:template>
+
   <!-- Copy content of mods:accessCondtition to mods:classification to enable classification support (see MIR-161) -->
   <xsl:template match="mods:accessCondition[@type='restriction on access'][contains(@xlink:href,'mir_access')]">
     <mods:accessCondition type="restriction on access">
diff --git a/mir-module/src/main/resources/xsl/mir-mods-utils.xsl b/mir-module/src/main/resources/xsl/mir-mods-utils.xsl
index 242f523c72..31da0062c8 100644
--- a/mir-module/src/main/resources/xsl/mir-mods-utils.xsl
+++ b/mir-module/src/main/resources/xsl/mir-mods-utils.xsl
@@ -53,6 +53,7 @@
         </xsl:variable>
 
         <xsl:variable name="affiliation" select="mods:affiliation/text()" />
+        <xsl:variable name="affiliation-ror" select="mods:affiliation[contains(@authorityURI, '//ror.org')]" />
         <xsl:variable name="personNodeId" select="generate-id(.)"/>
         <xsl:variable name="personName"><xsl:apply-templates select="." mode="nameString"/></xsl:variable>
         <xsl:if test="count($nameIdentifiers) &gt; 0 or string-length($affiliation) &gt; 0">
@@ -71,12 +72,21 @@
                         </dd>
                     </xsl:for-each>
                   </xsl:if>
-                  <xsl:if test="string-length($affiliation) &gt; 0">
+                  <xsl:if test="string-length($affiliation) &gt; 0 or $affiliation-ror">
                       <dt>
                         <xsl:value-of select="i18n:translate('mir.affiliation')"/>
                       </dt>
                       <dd>
                         <xsl:value-of select="$affiliation"/>
+                        <xsl:for-each select="mods:affiliation[contains(@authorityURI, '//ror.org')][@valueURI]">
+                            <xsl:sort select="@valueURI"/>
+                            <div class="mir-affiliation-ror">
+                                <xsl:value-of select="'ROR ID: '"/>
+                                <a href="{@valueURI}">
+                                    <xsl:value-of select="substring-after(@valueURI, @authorityURI)"/>
+                                </a>
+                            </div>
+                        </xsl:for-each>
                       </dd>
                   </xsl:if>
                 </dl>