diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
index 6b1fb87baa..8c53c3aa99 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-koha-indexdefs.xml
@@ -389,7 +389,6 @@
     <target_index>Title-cover:s</target_index>
     <target_index>Title:w</target_index>
     <target_index>Title:p</target_index>
-    <target_index>Title:s</target_index>
   </index_subfields>
   <!--record.abs line 114: melm 245$c      Author,Author-in-order:w,Author-in-order:p,Author-in-order:s-->
   <index_subfields tag="245" subfields="c">
diff --git a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
index 604c76a856..50c62d3fff 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
+++ b/etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
@@ -17,6 +17,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
   <xslo:template match="text()" mode="index_heading_conditional"/>
   <xslo:template match="text()" mode="index_match_heading"/>
   <xslo:template match="text()" mode="index_subject_thesaurus"/>
+  <xslo:template match="text()" mode="index_sort_tit"/>
   <xslo:template match="/">
     <xslo:if test="marc:collection">
       <collection>
@@ -42,6 +43,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       <xslo:apply-templates mode="index_match_heading"/>
       <xslo:apply-templates mode="index_subject_thesaurus"/>
       <xslo:apply-templates mode="index_all"/>
+      <xslo:apply-templates mode="index_sort_tit"/>
     </z:record>
   </xslo:template>
   <xslo:template match="marc:leader">
@@ -318,7 +320,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
   <xslo:template mode="index_subfields" match="marc:datafield[@tag='245']">
     <xslo:for-each select="marc:subfield">
       <xslo:if test="contains('a', @code)">
-        <z:index name="Title-cover:w Title-cover:p Title-cover:s Title:w Title:p Title:s">
+        <z:index name="Title-cover:w Title-cover:p Title-cover:s Title:w Title:p">
           <xslo:value-of select="."/>
         </z:index>
       </xslo:if>
@@ -2464,6 +2466,19 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
       <xslo:value-of select="."/>
     </z:index>
   </xslo:template>
+  <xslo:template mode="index_sort_tit" match="marc:datafield[@tag='245']">
+    <xslo:variable name="chop">
+      <xslo:choose>
+        <xslo:when test="not(number(@ind2))">0</xslo:when>
+        <xslo:otherwise>
+          <xslo:value-of select="number(@ind2)"/>
+        </xslo:otherwise>
+      </xslo:choose>
+    </xslo:variable>
+    <z:index name="Title:s">
+      <xslo:value-of select="substring(marc:subfield[@code='a'], $chop+1)"/>
+    </z:index>
+  </xslo:template>
   <xslo:template name="chopPunctuation">
     <xslo:param name="chopString"/>
     <xslo:variable name="length" select="string-length($chopString)"/>
diff --git a/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl b/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
index 9718e26823..59876caf73 100644
--- a/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
+++ b/etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
@@ -39,6 +39,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
             <xslo:template match="text()" mode="index_heading_conditional"/>
             <xslo:template match="text()" mode="index_match_heading"/>
             <xslo:template match="text()" mode="index_subject_thesaurus"/>
+            <xslo:template match="text()" mode="index_sort_tit"/>
             <xslo:template match="/">
                 <xslo:if test="marc:collection">
                     <collection>
@@ -65,6 +66,7 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
                     <xslo:apply-templates mode="index_match_heading"/>
                     <xslo:apply-templates mode="index_subject_thesaurus"/>
                     <xslo:apply-templates mode="index_all"/>
+                    <xslo:apply-templates mode="index_sort_tit"/>
                 </z:record>
             </xslo:template>
 
@@ -82,6 +84,17 @@ definition file (probably something like {biblio,authority}-koha-indexdefs.xml)
                     <xslo:value-of select="."/>
                 </z:index>
             </xslo:template>
+            <xslo:template mode="index_sort_tit" match="marc:datafield[@tag='245']">
+                <xslo:variable name="chop">
+                    <xslo:choose>
+                        <xslo:when test="not(number(@ind2))">0</xslo:when>
+                        <xslo:otherwise><xslo:value-of select="number(@ind2)"/></xslo:otherwise>
+                    </xslo:choose>
+                </xslo:variable>
+                <z:index name="Title:s">
+                    <xslo:value-of select="substring(marc:subfield[@code='a'], $chop+1)"/>
+                </z:index>
+            </xslo:template>
             <xslo:template name="chopPunctuation">
             <xslo:param name="chopString"/>
                 <xslo:variable name="length" select="string-length($chopString)"/>