diff --git a/importexport/musicxml/exportxml.cpp b/importexport/musicxml/exportxml.cpp
index ee15cf0334622..c490580687f18 100644
--- a/importexport/musicxml/exportxml.cpp
+++ b/importexport/musicxml/exportxml.cpp
@@ -6389,6 +6389,10 @@ static void identification(XmlWriter& xml, Score const* const score)
 
       xml.stag("encoding");
 
+      QString encoder = score->metaTag("encoder");
+      if (!encoder.isEmpty())
+            xml.tag("encoder", encoder);
+
       if (MScore::debugMode) {
             xml.tag("software", QString("MuseScore 0.7.0"));
             xml.tag("encoding-date", QString("2007-09-10"));
diff --git a/importexport/musicxml/importmxmlpass1.cpp b/importexport/musicxml/importmxmlpass1.cpp
index 6f63cf626fc87..1870979fe513c 100644
--- a/importexport/musicxml/importmxmlpass1.cpp
+++ b/importexport/musicxml/importmxmlpass1.cpp
@@ -1267,7 +1267,9 @@ void MusicXMLParserPass1::identification()
             else if (_e.name() == "encoding") {
                   // TODO
                   while (_e.readNextStartElement()) {
-                        if (_e.name() == "software") {
+                        if (_e.name() == "encoder")
+                              _score->setMetaTag("encoder", _e.readElementText());
+                        else if (_e.name() == "software") {
                               QString exporterString = _e.readElementText().toLower();
                               setExporterSoftware(exporterString);
                               }
diff --git a/mtest/musicxml/io/testOrnaments.xml b/mtest/musicxml/io/testOrnaments.xml
index 341662131fafb..fdf208b2b4a3c 100644
--- a/mtest/musicxml/io/testOrnaments.xml
+++ b/mtest/musicxml/io/testOrnaments.xml
@@ -5,8 +5,8 @@
     <work-title>Ornaments import test</work-title>
     </work>
   <identification>
-    <creator type="composer">Klaus Rettinghaus</creator>
     <encoding>
+      <encoder>Klaus Rettinghaus</encoder>
       <software>MuseScore 0.7.0</software>
       <encoding-date>2007-09-10</encoding-date>
       <supports element="accidental" type="yes"/>
diff --git a/mtest/musicxml/io/testSibOttavas_ref.mscx b/mtest/musicxml/io/testSibOttavas_ref.mscx
index a09711d7b7e68..9de3084f860ad 100644
--- a/mtest/musicxml/io/testSibOttavas_ref.mscx
+++ b/mtest/musicxml/io/testSibOttavas_ref.mscx
@@ -89,6 +89,7 @@
     <metaTag name="arranger"></metaTag>
     <metaTag name="composer"></metaTag>
     <metaTag name="copyright"></metaTag>
+    <metaTag name="encoder">James Mizen</metaTag>
     <metaTag name="lyricist"></metaTag>
     <metaTag name="movementNumber"></metaTag>
     <metaTag name="movementTitle"></metaTag>