diff --git a/C4/Context.pm b/C4/Context.pm
index a95c6b6467..e785002c4d 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -656,6 +656,8 @@ sub Zconn {
         $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server});
 
         $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax);
+        $context->{ Zconn }->{ $server }->option(
+            preferredRecordSyntax => C4::Context->preference("marcflavour") );
         return $context->{"Zconn"}->{$server};
     }
 }
diff --git a/Makefile.PL b/Makefile.PL
index b6ca640d3f..b677f6a719 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -508,6 +508,7 @@ my $pl_files = {
 if ($config{'INSTALL_ZEBRA'} eq "yes") {
     push @{ $pl_files->{'rewrite-config.PL'} }, (
         'blib/ZEBRA_CONF_DIR/etc/passwd',
+        'blib/ZEBRA_CONF_DIR/etc/usmarc.mar',
         'blib/ZEBRA_CONF_DIR/zebra-biblios.cfg',
         'blib/ZEBRA_CONF_DIR/zebra-biblios-dom.cfg',
         'blib/ZEBRA_CONF_DIR/zebra-authorities.cfg',
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index a54c173357..53d7ce8b35 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -44,47 +44,47 @@ __PAZPAR2_TOGGLE_XML_POST__
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
      <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
        <retrieval syntax="xml" name="B"/>
        <retrieval syntax="xml" name="marcxml"
                   identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rss2">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
@@ -124,38 +124,38 @@ __PAZPAR2_TOGGLE_XML_POST__
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
      <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="marcxml"
                   identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
@@ -193,47 +193,47 @@ __PAZPAR2_TOGGLE_XML_POST__
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
      <retrievalinfo>
-       <retrieval syntax="usmarc" name="F"/>
-       <retrieval syntax="usmarc" name="B"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+       <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
        <retrieval syntax="xml" name="B"/>
        <retrieval syntax="xml" name="marcxml"
                   identifier="info:srw/schema/1/marcxml-v1.1">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="dc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="mods">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rdfdc">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="rss2">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RSS2.xsl"/>
          </backend>
        </retrieval>
        <retrieval syntax="xml" name="utils">
-         <backend syntax="usmarc" name="F">
+         <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
            <marc inputformat="marc" outputformat="marcxml"
                  inputcharset="utf-8"/>
            <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
diff --git a/etc/zebradb/etc/usmarc.mar b/etc/zebradb/etc/usmarc.mar
index 99920f981c..a977ae5756 100644
--- a/etc/zebradb/etc/usmarc.mar
+++ b/etc/zebradb/etc/usmarc.mar
@@ -1,3 +1,3 @@
 # $Id: usmarc.mar,v 1.1 2002/10/22 12:51:09 adam Exp $
-name usmarc
-reference USmarc
+name __ZEBRA_MARC_FORMAT__
+reference __ZEBRA_MARC_FORMAT__
diff --git a/etc/zebradb/retrieval-info-auth-dom.xml b/etc/zebradb/retrieval-info-auth-dom.xml
index 3093c722b8..f8480126ed 100644
--- a/etc/zebradb/retrieval-info-auth-dom.xml
+++ b/etc/zebradb/retrieval-info-auth-dom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <retrievalinfo xmlns="http://indexdata.com/yaz">
-  <retrieval syntax="usmarc" name="F">
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F">
     <backend syntax="xml" name="marc">
       <marc inputformat="xml" outputformat="marc"
             inputcharset="utf-8"
             outputcharset="utf-8"/>
     </backend>
   </retrieval>
-  <retrieval syntax="usmarc" name="B">
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B">
     <backend syntax="xml" name="marc">
       <marc inputformat="xml" outputformat="marc"
             inputcharset="utf-8"
diff --git a/etc/zebradb/retrieval-info-auth-grs1.xml b/etc/zebradb/retrieval-info-auth-grs1.xml
index 58f319df87..f1f8898650 100644
--- a/etc/zebradb/retrieval-info-auth-grs1.xml
+++ b/etc/zebradb/retrieval-info-auth-grs1.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <retrievalinfo xmlns="http://indexdata.com/yaz">
-  <retrieval syntax="usmarc" name="F"/>
-  <retrieval syntax="usmarc" name="B"/>
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
   <retrieval syntax="xml" name="marcxml"
              identifier="info:srw/schema/1/marcxml-v1.1">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="dc">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="mods">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="rdfdc">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="utils">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>
diff --git a/etc/zebradb/retrieval-info-bib-dom.xml b/etc/zebradb/retrieval-info-bib-dom.xml
index 3093c722b8..f8480126ed 100644
--- a/etc/zebradb/retrieval-info-bib-dom.xml
+++ b/etc/zebradb/retrieval-info-bib-dom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <retrievalinfo xmlns="http://indexdata.com/yaz">
-  <retrieval syntax="usmarc" name="F">
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F">
     <backend syntax="xml" name="marc">
       <marc inputformat="xml" outputformat="marc"
             inputcharset="utf-8"
             outputcharset="utf-8"/>
     </backend>
   </retrieval>
-  <retrieval syntax="usmarc" name="B">
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B">
     <backend syntax="xml" name="marc">
       <marc inputformat="xml" outputformat="marc"
             inputcharset="utf-8"
diff --git a/etc/zebradb/retrieval-info-bib-grs1.xml b/etc/zebradb/retrieval-info-bib-grs1.xml
index 58f319df87..f1f8898650 100644
--- a/etc/zebradb/retrieval-info-bib-grs1.xml
+++ b/etc/zebradb/retrieval-info-bib-grs1.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <retrievalinfo xmlns="http://indexdata.com/yaz">
-  <retrieval syntax="usmarc" name="F"/>
-  <retrieval syntax="usmarc" name="B"/>
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
+  <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
   <retrieval syntax="xml" name="marcxml"
              identifier="info:srw/schema/1/marcxml-v1.1">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="dc">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2DC.xsl"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="mods">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2MODS.xsl"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="rdfdc">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
     </backend>
   </retrieval>
   <retrieval syntax="xml" name="utils">
-    <backend syntax="usmarc" name="F">
+    <backend syntax="__ZEBRA_MARC_FORMAT__" name="F">
       <marc inputformat="marc" outputformat="marcxml"
             inputcharset="utf-8"/>
       <xslt stylesheet="__INTRANET_TMPL_DIR__/prog/en/xslt/MARC21slimUtils.xsl"/>