diff --git a/History.md b/History.md
index 34ee638d..fba3aa1a 100644
--- a/History.md
+++ b/History.md
@@ -1,7 +1,8 @@
 1.5.6
 =====
 
-closes #69
+closes #69.
+Corrected EN 16931 XMP Schema Extension header
 
 1.5.5
 =====
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaZugferd.java b/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaZugferd.java
index 20ad24ea..ef6eb8ba 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaZugferd.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaZugferd.java
@@ -40,8 +40,10 @@ public class XMPSchemaZugferd extends XMPSchema {
 
         String conformanceLevelValue=conformanceLevel.name();
         if (conformanceLevelValue.equals("BASICWL")) {
-        		conformanceLevelValue="BASIC WL";
-        }
+    			conformanceLevelValue="BASIC WL";
+        } else if (conformanceLevelValue.equals("EN16931")) {
+        		conformanceLevelValue="EN 16931";
+        	}
         setTextPropertyValue("ConformanceLevel", conformanceLevelValue);
         setTextPropertyValue("DocumentType", "INVOICE");
         setTextPropertyValue("DocumentFileName", filename);
diff --git a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
index 70afed71..a184e89e 100644
--- a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
+++ b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java
@@ -49,7 +49,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 
 	// //////// TESTS
 	// //////////////////////////////////////////////////////////////////////////////////////////
-	public void testCustomZF2Export() throws Exception {
+	 public void testCustomZF2Export() throws Exception {
 
 		final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20171118_506custom.pdf";
 		// the writing part
@@ -253,7 +253,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 					"		</ram:ApplicableHeaderTradeSettlement>\n" + 
 					"	</rsm:SupplyChainTradeTransaction>\n" + 
 					"</rsm:CrossIndustryInvoice>";
-			zea1.setZUGFeRDXMLData(ownZUGFeRDXML.getBytes("UTF-8"));
+			 zea1.setZUGFeRDXMLData(ownZUGFeRDXML.getBytes("UTF-8"));
 
 			ByteArrayOutputStream baos=new ByteArrayOutputStream();
 			zea1.disableAutoClose(true);
@@ -262,7 +262,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 			zea1.close();
 			String pdfContent=baos.toString("UTF-8");
 			assertFalse(pdfContent.indexOf("(via mustangproject.org")==-1);
-			assertFalse(pdfContent.indexOf("<zf:ConformanceLevel>EN16931</zf:ConformanceLevel>") == -1);
+			assertFalse(pdfContent.indexOf("<zf:ConformanceLevel>EN 16931</zf:ConformanceLevel>") == -1);
 
 		} catch (IOException e) {
 			// TODO Auto-generated catch block