diff --git a/autotests/epubextractortest.cpp b/autotests/epubextractortest.cpp
--- a/autotests/epubextractortest.cpp
+++ b/autotests/epubextractortest.cpp
@@ -50,13 +50,29 @@
     QCOMPARE(result.properties().value(Property::Author), QVariant(QStringLiteral("Happy Man")));
     QCOMPARE(result.properties().value(Property::Publisher), QVariant(QStringLiteral("Happy Publisher")));
     QCOMPARE(result.properties().value(Property::Title), QVariant(QStringLiteral("The Big Brown Bear")));
-    QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("Baloo KFileMetaData")));
+    QCOMPARE(result.properties().value(Property::Subject), QVariant(QStringLiteral("Baloo KFile Meta Data")));
+    const QList<QVariant> expectedValues = {
+        QStringLiteral("Data"),
+        QStringLiteral("Meta"),
+        QStringLiteral("KFile"),
+        QStringLiteral("Baloo"),
+    };
+    QCOMPARE(result.properties().values(Property::Keywords), expectedValues);
+
+    const QList<QVariant> expectedOrder = {
+        QStringLiteral("Baloo"),
+        QStringLiteral("KFile"),
+        QStringLiteral("Meta"),
+        QStringLiteral("Data"),
+    };
+    QEXPECT_FAIL("", "Order not preserved", Continue);
+    QCOMPARE(result.properties().values(Property::Keywords), expectedOrder);
 
     QDateTime dt(QDate(2014, 1, 1), QTime(1, 1, 1));
     dt.setTimeSpec(Qt::UTC);
     QCOMPARE(result.properties().value(Property::CreationDate), QVariant(dt));
 
-    QCOMPARE(result.properties().size(), 5);
+    QCOMPARE(result.properties().size(), 9);
 }
 
 void EPubExtractorTest::testMetaDataOnly()
diff --git a/autotests/multivaluetest.cpp b/autotests/multivaluetest.cpp
--- a/autotests/multivaluetest.cpp
+++ b/autotests/multivaluetest.cpp
@@ -97,23 +97,23 @@
         << QStringLiteral("application/epub+zip")
         << Property::Subject
         << QVariantList{}
-        << QStringLiteral("Subject should not be valid when there is more than one")
+        << QString()
         ;
     // Always provide Property::Keywords
     QTest::newRow("epub/1 keyword")
         << QFINDTESTDATA("samplefiles/test.epub")
         << QStringLiteral("application/epub+zip")
         << property
         << QVariantList{QVariant(QStringLiteral("Baloo KFileMetaData"))}
-        << QStringLiteral("keywords not implemented")
+        << QString()
         ;
 
     QTest::newRow("epub/keywords")
         << QFINDTESTDATA("samplefiles/multi/test.epub")
         << QStringLiteral("application/epub+zip")
         << property
         << expectedResult
-        << QStringLiteral("keywords not implemented")
+        << QString()
         ;
 
 
diff --git a/autotests/samplefiles/test.epub b/autotests/samplefiles/test.epub
index cc7cfad9384c0d4a47dcf5f68cade7e409699e06..6ea133454174fb2ac67eeca9f21178b06a1beb44
GIT binary patch
literal 5111
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

literal 5107
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

diff --git a/src/extractors/epubextractor.cpp b/src/extractors/epubextractor.cpp
--- a/src/extractors/epubextractor.cpp
+++ b/src/extractors/epubextractor.cpp
@@ -44,7 +44,7 @@
 
 namespace
 {
-QString fetchMetadata(struct epub* e, const epub_metadata& type)
+QStringList fetchMetadata(struct epub* e, const epub_metadata& type)
 {
     int size = 0;
     unsigned char** data = epub_get_metadata(e, type, &size);
@@ -60,9 +60,13 @@
         }
         free(data);
 
-        return strList.join(QLatin1Char(';'));
+        return strList;
     }
-    return QString();
+    return QStringList();
+}
+QString fetchMetadataString(struct epub* e, const epub_metadata& type)
+{
+   return fetchMetadata(e, type).join(QLatin1Char(';'));
 }
 }
 
@@ -78,17 +82,22 @@
 
     result->addType(Type::Document);
 
-    QString value = fetchMetadata(ePubDoc, EPUB_TITLE);
+    QString value = fetchMetadataString(ePubDoc, EPUB_TITLE);
     if (!value.isEmpty()) {
         result->add(Property::Title, value);
     }
 
-    value = fetchMetadata(ePubDoc, EPUB_SUBJECT);
-    if (!value.isEmpty()) {
-        result->add(Property::Subject, value);
+    QStringList values = fetchMetadata(ePubDoc, EPUB_SUBJECT);
+    if (values.size() > 1) {
+        for (const auto& value : values) {
+            result->add(Property::Keywords, value);
+        }
+    } else if (values.size() == 1) {
+        result->add(Property::Keywords, values[0]);
+        result->add(Property::Subject, values[0]);
     }
 
-    value = fetchMetadata(ePubDoc, EPUB_CREATOR);
+    value = fetchMetadataString(ePubDoc, EPUB_CREATOR);
     if (!value.isEmpty()) {
         if (value.startsWith(QLatin1String("aut:"), Qt::CaseInsensitive)) {
             value = value.mid(4).simplified();
@@ -116,17 +125,17 @@
         graph << con;
     }*/
 
-    value = fetchMetadata(ePubDoc, EPUB_PUBLISHER);
+    value = fetchMetadataString(ePubDoc, EPUB_PUBLISHER);
     if (!value.isEmpty()) {
         result->add(Property::Publisher, value);
     }
 
-    value = fetchMetadata(ePubDoc, EPUB_DESCRIPTION);
+    value = fetchMetadataString(ePubDoc, EPUB_DESCRIPTION);
     if (!value.isEmpty()) {
         result->add(Property::Comment, value);
     }
 
-    value = fetchMetadata(ePubDoc, EPUB_DATE);
+    value = fetchMetadataString(ePubDoc, EPUB_DATE);
     if (!value.isEmpty()) {
         if (value.startsWith(QLatin1String("Unspecified:"), Qt::CaseInsensitive)) {
             value = value.mid(QByteArray("Unspecified:").size()).simplified();