diff --git a/account_ebics/README.rst b/account_ebics/README.rst
index 170918d..7d390ef 100644
--- a/account_ebics/README.rst
+++ b/account_ebics/README.rst
@@ -73,7 +73,7 @@ We also recommend to consider the installation of the following modules:
 
   The import helper will match the local bank account number with the IBAN number specified on the Odoo Financial journal.
 
-  Cf. https://github.com/noviat-apps
+  Cf. https://github.com/Noviat/noviat-apps
 
 |
 
diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index f3f2a9b..184eb15 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -1,9 +1,9 @@
-# Copyright 2009-2020 Noviat.
+# Copyright 2009-2021 Noviat.
 # License LGPL-3 or later (http://www.gnu.org/licenses/lpgl).
 
 {
     'name': 'EBICS banking protocol',
-    'version': '13.0.1.3.0',
+    'version': '13.0.1.3.1',
     'license': 'LGPL-3',
     'author': 'Noviat',
     'website': 'www.noviat.com',
diff --git a/account_ebics/data/ebics_file_format.xml b/account_ebics/data/ebics_file_format.xml
index beeb1bb..e720900 100644
--- a/account_ebics/data/ebics_file_format.xml
+++ b/account_ebics/data/ebics_file_format.xml
@@ -91,7 +91,7 @@
       <field name="type">up</field>
       <field name="order_type">FUL</field>
       <field name="description">Remises de LCR</field>
-      <field name="suffix">lcr.dat</field>
+      <field name="suffix">txt</field>
     </record>
 
     <record id="ebics_ff_CCT" model="ebics.file.format">
@@ -99,7 +99,7 @@
       <field name="type">up</field>
       <field name="order_type">CCT</field>
       <field name="description">Payment Order in format pain.001.001.03</field>
-      <field name="suffix">cct.xml</field>
+      <field name="suffix">xml</field>
     </record>
 
     <record id="ebics_ff_XE2" model="ebics.file.format">
@@ -107,7 +107,7 @@
       <field name="type">up</field>
       <field name="order_type">XE2</field>
       <field name="description">Payment Order in format pain.001.001.03</field>
-      <field name="suffix">cct.xml</field>
+      <field name="suffix">xml</field>
     </record>
 
     <record id="ebics_ff_CDD" model="ebics.file.format">
@@ -115,7 +115,7 @@
       <field name="type">up</field>
       <field name="order_type">CDD</field>
       <field name="description">Sepa Core Direct Debit Order in format pain.008.001.02</field>
-      <field name="suffix">sdd.xml</field>
+      <field name="suffix">xml</field>
     </record>
 
     <record id="ebics_ff_XE3" model="ebics.file.format">
@@ -123,7 +123,7 @@
       <field name="type">up</field>
       <field name="order_type">XE3</field>
       <field name="description">Sepa Core Direct Debit Order in format pain.008.001.02</field>
-      <field name="suffix">sdd.xml</field>
+      <field name="suffix">xml</field>
     </record>
     
     <record id="ebics_ff_CDB" model="ebics.file.format">
@@ -131,7 +131,7 @@
       <field name="type">up</field>
       <field name="order_type">CDB</field>
       <field name="description">Sepa Direct Debit (B2B) Order in format pain.008.001.02</field>
-      <field name="suffix">sbb.xml</field>
+      <field name="suffix">xml</field>
     </record>
 
     <record id="ebics_ff_XE4" model="ebics.file.format">
@@ -139,7 +139,7 @@
       <field name="type">up</field>
       <field name="order_type">XE4</field>
       <field name="description">Sepa Direct Debit (B2B) Order in format pain.008.001.02</field>
-      <field name="suffix">sbb.xml</field>
+      <field name="suffix">xml</field>
     </record>
 
     <record id="ebics_ff_FUL_pain_001_001_02_sct" model="ebics.file.format">
@@ -147,7 +147,7 @@
       <field name="type">up</field>
       <field name="order_type">FUL</field>
       <field name="description">Payment Order in format pain.001.001.02</field>
-      <field name="suffix">cct.xml</field>
+      <field name="suffix">xml</field>
     </record>
 
   </data>
diff --git a/account_ebics/static/description/index.html b/account_ebics/static/description/index.html
index 42b8115..a2861eb 100644
--- a/account_ebics/static/description/index.html
+++ b/account_ebics/static/description/index.html
@@ -411,7 +411,7 @@ ul.auto-toc {
 <li><p class="first">account_bank_statement_import_helper</p>
 <p>Required if you are processing bank statements with local bank account numbers (e.g. french CFONB files).</p>
 <p>The import helper will match the local bank account number with the IBAN number specified on the Odoo Financial journal.</p>
-<p>Cf. <a class="reference external" href="https://github.com/noviat-apps">https://github.com/noviat-apps</a></p>
+<p>Cf. <a class="reference external" href="https://github.com/Noviat/noviat-apps">https://github.com/Noviat/noviat-apps</a></p>
 </li>
 </ul>
 <div class="line-block">
diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py
index f2011fd..01e1c48 100644
--- a/account_ebics/wizards/ebics_xfer.py
+++ b/account_ebics/wizards/ebics_xfer.py
@@ -123,12 +123,17 @@ class EbicsXfer(models.TransientModel):
     @api.onchange('upload_data')
     def _onchange_upload_data(self):
         self.upload_fname_dummy = self.upload_fname
+        self.format_id = False
         self._detect_upload_format()
-        upload_formats = self.format_id \
-            or self.ebics_config_id.ebics_file_format_ids.filtered(
-                lambda r: r.type == 'up')
-        if len(upload_formats) == 1:
-            self.format_id = upload_formats
+        if not self.format_id:
+            upload_formats = self.format_id \
+                or self.ebics_config_id.ebics_file_format_ids.filtered(
+                    lambda r: r.type == 'up')
+            if len(upload_formats) > 1:
+                upload_formats = upload_formats.filtered(
+                    lambda r: self.upload_fname.endswith(r.suffix))
+            if len(upload_formats) == 1:
+                self.format_id = upload_formats
 
     @api.onchange('format_id')
     def _onchange_format_id(self):