diff --git a/Makefile.PL b/Makefile.PL
index 9cb34e0d6a..02e96890cc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -509,7 +509,6 @@ 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/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 4b1c867b76..2d7d12416c 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -29,47 +29,47 @@
     <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
      <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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
@@ -104,42 +104,42 @@
     <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
     <config>/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
-    <xi:include href="/etc/koha/zebradb/retrieval-info-auth-dom.xml"
+    <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-auth-dom.xml"
                 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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
@@ -179,47 +179,47 @@
     <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
      <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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/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="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
diff --git a/debian/templates/marc21-retrieval-info-auth-dom.xml b/debian/templates/marc21-retrieval-info-auth-dom.xml
new file mode 100644
index 0000000000..7e45f3873c
--- /dev/null
+++ b/debian/templates/marc21-retrieval-info-auth-dom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="marc21" name="F">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="marc21" name="B">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
+  <retrieval syntax="xml" name="marc"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+</retrievalinfo>
diff --git a/debian/templates/marc21-retrieval-info-auth-grs1.xml b/debian/templates/marc21-retrieval-info-auth-grs1.xml
new file mode 100644
index 0000000000..a50260fc5d
--- /dev/null
+++ b/debian/templates/marc21-retrieval-info-auth-grs1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="marc21" name="F"/>
+  <retrieval syntax="marc21" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="dc">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="mods">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="rdfdc">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="utils">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
+    </backend>
+  </retrieval>
+</retrievalinfo>
diff --git a/debian/templates/marc21-retrieval-info-bib-dom.xml b/debian/templates/marc21-retrieval-info-bib-dom.xml
new file mode 100644
index 0000000000..7e45f3873c
--- /dev/null
+++ b/debian/templates/marc21-retrieval-info-bib-dom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="marc21" name="F">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="marc21" name="B">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
+  <retrieval syntax="xml" name="marc"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+</retrievalinfo>
diff --git a/debian/templates/marc21-retrieval-info-bib-grs1.xml b/debian/templates/marc21-retrieval-info-bib-grs1.xml
new file mode 100644
index 0000000000..a50260fc5d
--- /dev/null
+++ b/debian/templates/marc21-retrieval-info-bib-grs1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="marc21" name="F"/>
+  <retrieval syntax="marc21" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="dc">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="mods">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="rdfdc">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="utils">
+    <backend syntax="marc21" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
+    </backend>
+  </retrieval>
+</retrievalinfo>
diff --git a/debian/templates/normarc-retrieval-info-auth-dom.xml b/debian/templates/normarc-retrieval-info-auth-dom.xml
new file mode 100644
index 0000000000..f723f9aa5a
--- /dev/null
+++ b/debian/templates/normarc-retrieval-info-auth-dom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="normarc" name="F">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="normarc" name="B">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
+  <retrieval syntax="xml" name="marc"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+</retrievalinfo>
diff --git a/debian/templates/normarc-retrieval-info-auth-grs1.xml b/debian/templates/normarc-retrieval-info-auth-grs1.xml
new file mode 100644
index 0000000000..4b0742da7c
--- /dev/null
+++ b/debian/templates/normarc-retrieval-info-auth-grs1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="normarc" name="F"/>
+  <retrieval syntax="normarc" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="dc">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="mods">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="rdfdc">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="utils">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
+    </backend>
+  </retrieval>
+</retrievalinfo>
diff --git a/debian/templates/normarc-retrieval-info-bib-dom.xml b/debian/templates/normarc-retrieval-info-bib-dom.xml
new file mode 100644
index 0000000000..f723f9aa5a
--- /dev/null
+++ b/debian/templates/normarc-retrieval-info-bib-dom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="normarc" name="F">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="normarc" name="B">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
+  <retrieval syntax="xml" name="marc"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+</retrievalinfo>
diff --git a/debian/templates/normarc-retrieval-info-bib-grs1.xml b/debian/templates/normarc-retrieval-info-bib-grs1.xml
new file mode 100644
index 0000000000..4b0742da7c
--- /dev/null
+++ b/debian/templates/normarc-retrieval-info-bib-grs1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="normarc" name="F"/>
+  <retrieval syntax="normarc" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="dc">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="mods">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="rdfdc">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="utils">
+    <backend syntax="normarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
+    </backend>
+  </retrieval>
+</retrievalinfo>
diff --git a/debian/templates/unimarc-retrieval-info-auth-dom.xml b/debian/templates/unimarc-retrieval-info-auth-dom.xml
new file mode 100644
index 0000000000..941f8e8c1c
--- /dev/null
+++ b/debian/templates/unimarc-retrieval-info-auth-dom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="unimarc" name="F">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="unimarc" name="B">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
+  <retrieval syntax="xml" name="marc"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+</retrievalinfo>
diff --git a/debian/templates/unimarc-retrieval-info-auth-grs1.xml b/debian/templates/unimarc-retrieval-info-auth-grs1.xml
new file mode 100644
index 0000000000..df703a81d5
--- /dev/null
+++ b/debian/templates/unimarc-retrieval-info-auth-grs1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="unimarc" name="F"/>
+  <retrieval syntax="unimarc" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="dc">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="mods">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="rdfdc">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="utils">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
+    </backend>
+  </retrieval>
+</retrievalinfo>
diff --git a/debian/templates/unimarc-retrieval-info-bib-dom.xml b/debian/templates/unimarc-retrieval-info-bib-dom.xml
new file mode 100644
index 0000000000..941f8e8c1c
--- /dev/null
+++ b/debian/templates/unimarc-retrieval-info-bib-dom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="unimarc" name="F">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="unimarc" name="B">
+    <backend syntax="xml" name="marc">
+      <marc inputformat="xml" outputformat="marc"
+            inputcharset="utf-8"
+            outputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="index"/> <!-- allow viewing index entries -->
+  <retrieval syntax="xml" name="marc"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1"/>
+</retrievalinfo>
diff --git a/debian/templates/unimarc-retrieval-info-bib-grs1.xml b/debian/templates/unimarc-retrieval-info-bib-grs1.xml
new file mode 100644
index 0000000000..df703a81d5
--- /dev/null
+++ b/debian/templates/unimarc-retrieval-info-bib-grs1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<retrievalinfo xmlns="http://indexdata.com/yaz">
+  <retrieval syntax="unimarc" name="F"/>
+  <retrieval syntax="unimarc" name="B"/>
+  <retrieval syntax="xml" name="marcxml"
+             identifier="info:srw/schema/1/marcxml-v1.1">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="dc">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="mods">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="rdfdc">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slim2RDFDC.xsl"/>
+    </backend>
+  </retrieval>
+  <retrieval syntax="xml" name="utils">
+    <backend syntax="unimarc" name="F">
+      <marc inputformat="marc" outputformat="marcxml"
+            inputcharset="utf-8"/>
+      <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
+    </backend>
+  </retrieval>
+</retrievalinfo>
diff --git a/etc/zebradb/etc/marc21.mar b/etc/zebradb/etc/marc21.mar
new file mode 100644
index 0000000000..2e1abe3909
--- /dev/null
+++ b/etc/zebradb/etc/marc21.mar
@@ -0,0 +1,2 @@
+name marc21
+reference marc21
diff --git a/etc/zebradb/etc/normarc.mar b/etc/zebradb/etc/normarc.mar
new file mode 100644
index 0000000000..fe470c3a69
--- /dev/null
+++ b/etc/zebradb/etc/normarc.mar
@@ -0,0 +1,2 @@
+name normarc
+reference normarc
diff --git a/etc/zebradb/etc/unimarc.mar b/etc/zebradb/etc/unimarc.mar
new file mode 100644
index 0000000000..cf905d124a
--- /dev/null
+++ b/etc/zebradb/etc/unimarc.mar
@@ -0,0 +1,2 @@
+name unimarc
+reference unimarc
diff --git a/etc/zebradb/etc/usmarc.mar b/etc/zebradb/etc/usmarc.mar
index a977ae5756..348c9a19a2 100644
--- a/etc/zebradb/etc/usmarc.mar
+++ b/etc/zebradb/etc/usmarc.mar
@@ -1,3 +1,2 @@
-# $Id: usmarc.mar,v 1.1 2002/10/22 12:51:09 adam Exp $
-name __ZEBRA_MARC_FORMAT__
-reference __ZEBRA_MARC_FORMAT__
+name usmarc
+reference USmarc
diff --git a/etc/zebradb/marc_defs/marc21/authorities/record.abs b/etc/zebradb/marc_defs/marc21/authorities/record.abs
index f185887e0f..0e0d4514e0 100644
--- a/etc/zebradb/marc_defs/marc21/authorities/record.abs
+++ b/etc/zebradb/marc_defs/marc21/authorities/record.abs
@@ -14,7 +14,7 @@ attset gils.att
 esetname F @
 esetname B @
 
-marc usmarc.mar
+marc marc21.mar
 systag sysno rank
 xpath enable
 
diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
index 0f8360eae2..5ff08f49f5 100644
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -21,7 +21,7 @@ attset gils.att
 esetname F @
 esetname B @
 
-marc usmarc.mar
+marc marc21.mar
 systag sysno rank
 xpath enable
 # Some notes:
diff --git a/etc/zebradb/marc_defs/normarc/biblios/record.abs b/etc/zebradb/marc_defs/normarc/biblios/record.abs
index 97d5334c38..596ed3f628 100644
--- a/etc/zebradb/marc_defs/normarc/biblios/record.abs
+++ b/etc/zebradb/marc_defs/normarc/biblios/record.abs
@@ -35,7 +35,7 @@ attset gils.att
 esetname F @
 esetname B @
 
-marc usmarc.mar
+marc normarc.mar
 systag sysno rank
 xpath enable
 # Some notes:
diff --git a/etc/zebradb/marc_defs/unimarc/authorities/record.abs b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
index c6ed01ffd1..5c992a86da 100644
--- a/etc/zebradb/marc_defs/unimarc/authorities/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/authorities/record.abs
@@ -6,7 +6,7 @@ attset gils.att
 esetname F @
 esetname B @
 
-marc usmarc.mar
+marc unimarc.mar
 systag sysno rank
 xpath enable
 
diff --git a/etc/zebradb/marc_defs/unimarc/biblios/record.abs b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
index 44a5bbe013..dd481b66ea 100644
--- a/etc/zebradb/marc_defs/unimarc/biblios/record.abs
+++ b/etc/zebradb/marc_defs/unimarc/biblios/record.abs
@@ -16,7 +16,7 @@ attset gils.att
 esetname F @
 esetname B @
 
-marc usmarc.mar
+marc unimarc.mar
 systag sysno rank
 xpath disable