diff --git a/guide/release-notes/main.adoc b/guide/release-notes/main.adoc
index b61fa451..c5a9dc74 100644
--- a/guide/release-notes/main.adoc
+++ b/guide/release-notes/main.adoc
@@ -15,6 +15,8 @@ IMPORTANT: Changes in code lists are also reflected by changes in the validation
 
 :leveloffset: +1
 
+include::v3.0.18.adoc[]
+
 include::v3.0.17.adoc[]
 
 include::v3.0.16.adoc[]
diff --git a/guide/release-notes/v3.0.18.adoc b/guide/release-notes/v3.0.18.adoc
new file mode 100644
index 00000000..f8d7276b
--- /dev/null
+++ b/guide/release-notes/v3.0.18.adoc
@@ -0,0 +1,13 @@
+= Version 3.0.17
+[horizontal]
+Release date:: May 2024
+
+== Changes to BIS document
+
+None
+
+== Changes to code lists and validation artefacts
+
+* The rule (PEPPOL-EN16931-R002), which ensures that the Invoice Note (BT-22) appears no more than once, will not apply if both the buyer and seller are German organizations.
+
+==  EN 16931 schematrons updated
diff --git a/rules/sch/PEPPOL-EN16931-UBL.sch b/rules/sch/PEPPOL-EN16931-UBL.sch
index 8dbce313..950ba47e 100644
--- a/rules/sch/PEPPOL-EN16931-UBL.sch
+++ b/rules/sch/PEPPOL-EN16931-UBL.sch
@@ -38,6 +38,11 @@ Last update: 2024 May release 3.0.17.
 		else
 		'XX'"/>
   <!-- -->
+  <let name="supplierCountryIsDE"
+	  value="(upper-case(normalize-space(/*/cac:AccountingSupplierParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'DE')"/>
+  <let name="customerCountryIsDE"
+	  value="(upper-case(normalize-space(/*/cac:AccountingCustomerParty/cac:Party/cac:PostalAddress/cac:Country/cbc:IdentificationCode)) = 'DE')"/>
+	  
   <let name="documentCurrencyCode" value="/*/cbc:DocumentCurrencyCode"/>
   <!-- Functions -->
   <function xmlns="http://www.w3.org/1999/XSL/Transform" name="u:gln" as="xs:boolean">
@@ -252,7 +257,7 @@ Last update: 2024 May release 3.0.17.
     <rule context="ubl-creditnote:CreditNote | ubl-invoice:Invoice">
       <assert id="PEPPOL-EN16931-R001" test="cbc:ProfileID" flag="fatal">Business process MUST be provided.</assert>
       <assert id="PEPPOL-EN16931-R007" test="$profile != 'Unknown'" flag="fatal">Business process MUST be in the format 'urn:fdc:peppol.eu:2017:poacc:billing:NN:1.0' where NN indicates the process number.</assert>
-      <assert id="PEPPOL-EN16931-R002" test="count(cbc:Note) &lt;= 1" flag="fatal">No more than one note is allowed on document level.</assert>
+      <assert id="PEPPOL-EN16931-R002" test="count(cbc:Note) &lt;= 1 or ($supplierCountryIsDE and $customerCountryIsDE)" flag="fatal">No more than one note is allowed on document level, unless both the buyer and seller are German organizations.</assert>
       <assert id="PEPPOL-EN16931-R003" test="cbc:BuyerReference or cac:OrderReference/cbc:ID" flag="fatal">A buyer reference or purchase order reference MUST be provided.</assert>
       <assert id="PEPPOL-EN16931-R004" test="starts-with(normalize-space(cbc:CustomizationID/text()), 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0')" flag="fatal">Specification identifier MUST have the value 'urn:cen.eu:en16931:2017#compliant#urn:fdc:peppol.eu:2017:poacc:billing:3.0'.</assert>
       <assert id="PEPPOL-EN16931-R053" test="count(cac:TaxTotal[cac:TaxSubtotal]) = 1" flag="fatal">Only one tax total with tax subtotals MUST be provided.</assert>
diff --git a/structure/syntax/ubl-creditnote.xml b/structure/syntax/ubl-creditnote.xml
index 53802893..cdfefb24 100755
--- a/structure/syntax/ubl-creditnote.xml
+++ b/structure/syntax/ubl-creditnote.xml
@@ -91,7 +91,7 @@
             <Value type="EXAMPLE">381</Value>
         </Element>
 
-        <Element cardinality="0..1">
+        <Element cardinality="0..n">
             <Term>cbc:Note</Term>
             <Name>Invoice note</Name>
             <Description>A textual note that gives unstructured information that is relevant to the Invoice as a whole.Such as the reason for any correction or
diff --git a/structure/syntax/ubl-invoice.xml b/structure/syntax/ubl-invoice.xml
index be3786b3..a51a2af8 100755
--- a/structure/syntax/ubl-invoice.xml
+++ b/structure/syntax/ubl-invoice.xml
@@ -82,7 +82,7 @@
             <Value type="EXAMPLE">380</Value>
         </Element>
 
-        <Element cardinality="0..1">
+        <Element cardinality="0..n">
             <Term>cbc:Note</Term>
             <Name>Invoice note</Name>
             <Description>A textual note that gives unstructured information that is relevant to the Invoice as a whole.Such as the reason for any correction or assignment note in case the invoice has been factored. </Description>