diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
index 7abd01d052..14e0408d65 100644
--- a/src/docks/encodedock.cpp
+++ b/src/docks/encodedock.cpp
@@ -36,6 +36,7 @@
 #include <QFileInfo>
 #include <QProcess>
 #include <QRegularExpression>
+#include <QRegularExpressionValidator>
 #include <QTimer>
 #include <QtMath>
 #include <QtWidgets>
@@ -46,6 +47,9 @@
 #define TO_RELATIVE(min, max, abs) qRound(100.0f * float((abs) - (min)) / float((max) - (min)))
 static const int kOpenCaptureFileDelayMs = 1500;
 static const int kCustomPresetFileNameRole = Qt::UserRole + 1;
+static const QRegularExpression kIsoDateRegex(
+    QStringLiteral("^\\d{4}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01])$"));
+static const QRegularExpression kIso639Regex(QStringLiteral("^[A-Za-z]{3}$"));
 #ifdef Q_OS_WIN
 static const QString kNullTarget = "nul";
 #else
@@ -97,6 +101,15 @@ EncodeDock::EncodeDock(QWidget *parent)
     ui->advancedButton->setChecked(Settings.encodeAdvanced());
     ui->advancedCheckBox->setChecked(Settings.encodeAdvanced());
     on_advancedButton_clicked(ui->advancedButton->isChecked());
+    ui->metaDateLineEdit->setValidator(
+        new QRegularExpressionValidator(kIsoDateRegex, ui->metaDateLineEdit));
+    ui->metaLanguageLineEdit->setValidator(
+        new QRegularExpressionValidator(kIso639Regex, ui->metaLanguageLineEdit));
+#if LIBMLT_VERSION_INT < ((7 << 16) + (37 << 8))
+    ui->coverArtLabel->setVisible(false);
+    ui->coverArtLineEdit->setVisible(false);
+    ui->coverArtButton->setVisible(false);
+#endif
 #if QT_POINTER_SIZE == 4
     // On 32-bit process, limit multi-threading to mitigate running out of memory.
     ui->parallelCheckbox->setChecked(false);
@@ -187,6 +200,15 @@ void EncodeDock::loadPresetFromProperties(Mlt::Properties &preset)
     QChar decimalPoint = MLT.decimalPoint();
     QString acodec = QString::fromLatin1(preset.get("acodec"));
     QString vcodec = QString::fromLatin1(preset.get("vcodec"));
+    ui->coverArtLineEdit->clear();
+    ui->metaTitleLineEdit->clear();
+    ui->metaArtistLineEdit->clear();
+    ui->metaCommentLineEdit->clear();
+    ui->metaCopyrightLineEdit->clear();
+    ui->metaDateLineEdit->clear();
+    ui->metaDescriptionLineEdit->clear();
+    ui->metaGenreLineEdit->clear();
+    ui->metaLanguageLineEdit->clear();
 
     if (ui->hwencodeCheckBox->isChecked()) {
         foreach (const QString &hw, Settings.encodeHardware()) {
@@ -386,6 +408,24 @@ void EncodeDock::loadPresetFromProperties(Mlt::Properties &preset)
                 ui->interpolationCombo->setCurrentIndex(3);
         } else if (name == "color_range" && (value == "pc" || value == "jpeg")) {
             ui->rangeComboBox->setCurrentIndex(1);
+        } else if (name == "attached_pic") {
+            ui->coverArtLineEdit->setText(value);
+        } else if (name == "meta.attr.title.markup") {
+            ui->metaTitleLineEdit->setText(value);
+        } else if (name == "meta.attr.artist.markup") {
+            ui->metaArtistLineEdit->setText(value);
+        } else if (name == "meta.attr.comment.markup") {
+            ui->metaCommentLineEdit->setText(value);
+        } else if (name == "meta.attr.copyright.markup") {
+            ui->metaCopyrightLineEdit->setText(value);
+        } else if (name == "meta.attr.date.markup") {
+            ui->metaDateLineEdit->setText(value);
+        } else if (name == "meta.attr.description.markup") {
+            ui->metaDescriptionLineEdit->setText(value);
+        } else if (name == "meta.attr.genre.markup") {
+            ui->metaGenreLineEdit->setText(value);
+        } else if (name == "alang") {
+            ui->metaLanguageLineEdit->setText(value);
         } else {
             if (name != "an" && name != "vn" && name != "threads"
                 && !(name == "frame_rate_den" && preset.property_exists("frame_rate_num"))
@@ -625,6 +665,42 @@ Mlt::Properties *EncodeDock::collectProperties(int realtime, bool includeProfile
     if (p && p->is_valid()) {
         foreach (QString line, ui->advancedTextEdit->toPlainText().split("\n"))
             p->parse(line.toUtf8().constData());
+        if (!ui->coverArtLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "attached_pic",
+                        ui->coverArtLineEdit->text().trimmed().toUtf8().constData());
+        if (!ui->metaTitleLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "meta.attr.title.markup",
+                        ui->metaTitleLineEdit->text().trimmed().toUtf8().constData());
+        if (!ui->metaArtistLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "meta.attr.artist.markup",
+                        ui->metaArtistLineEdit->text().trimmed().toUtf8().constData());
+        if (!ui->metaCommentLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "meta.attr.comment.markup",
+                        ui->metaCommentLineEdit->text().trimmed().toUtf8().constData());
+        if (!ui->metaCopyrightLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "meta.attr.copyright.markup",
+                        ui->metaCopyrightLineEdit->text().trimmed().toUtf8().constData());
+        if (kIsoDateRegex.match(ui->metaDateLineEdit->text().trimmed()).hasMatch())
+            setIfNotSet(p,
+                        "meta.attr.date.markup",
+                        ui->metaDateLineEdit->text().trimmed().toUtf8().constData());
+        if (!ui->metaDescriptionLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "meta.attr.description.markup",
+                        ui->metaDescriptionLineEdit->text().trimmed().toUtf8().constData());
+        if (!ui->metaGenreLineEdit->text().trimmed().isEmpty())
+            setIfNotSet(p,
+                        "meta.attr.genre.markup",
+                        ui->metaGenreLineEdit->text().trimmed().toUtf8().constData());
+        if (kIso639Regex.match(ui->metaLanguageLineEdit->text().trimmed()).hasMatch())
+            setIfNotSet(p,
+                        "alang",
+                        ui->metaLanguageLineEdit->text().trimmed().toLower().toUtf8().constData());
         if (realtime)
             setIfNotSet(p, "real_time", realtime);
         if (ui->formatCombo->currentIndex() != 0)
@@ -2122,9 +2198,15 @@ void EncodeDock::on_addPresetButton_clicked()
         foreach (QString line, ui->advancedTextEdit->toPlainText().split("\n"))
             data->parse(line.toUtf8().constData());
 
-        for (int i = 0; i < data->count(); i++)
-            if (strlen(data->get_name(i)) > 0)
-                ls << QStringLiteral("%1=%2").arg(data->get_name(i), data->get(i));
+        for (int i = 0; i < data->count(); i++) {
+            const char *name = data->get_name(i);
+            if (!name || !strlen(name) || !strcmp(name, "attached_pic"))
+                continue;
+
+            const auto key = QString::fromLatin1(name);
+            const auto value = QString::fromLatin1(data->get(i));
+            ls.append(QStringLiteral("%1=%2").arg(key, value));
+        }
     }
 
     dialog.setWindowTitle(tr("Add Export Preset"));
@@ -2954,6 +3036,20 @@ void EncodeDock::on_aspectDenSpinner_valueChanged(int value)
     on_aspectNumSpinner_valueChanged(value);
 }
 
+void EncodeDock::on_coverArtButton_clicked()
+{
+    auto path = QFileDialog::getOpenFileName(this,
+                                             tr("Open Cover Art"),
+                                             Settings.openPath(),
+                                             tr("Images (*.png *.jpg *.jpeg);;All Files (*)"),
+                                             nullptr,
+                                             Util::getFileDialogOptions());
+    if (!path.isEmpty()) {
+        ui->coverArtLineEdit->setText(path);
+        Settings.setOpenPath(QFileInfo(path).path());
+    }
+}
+
 void EncodeDock::setReframeEnabled(bool enabled)
 {
     ui->widthSpinner->setDisabled(enabled);
diff --git a/src/docks/encodedock.h b/src/docks/encodedock.h
index 83627549f3..04326ca074 100644
--- a/src/docks/encodedock.h
+++ b/src/docks/encodedock.h
@@ -141,6 +141,8 @@ private slots:
 
     void on_aspectDenSpinner_valueChanged(int value);
 
+    void on_coverArtButton_clicked();
+
 private:
     enum {
         RateControlAverage = 0,
diff --git a/src/docks/encodedock.ui b/src/docks/encodedock.ui
index 0a5f1e00a9..aeffea63e5 100644
--- a/src/docks/encodedock.ui
+++ b/src/docks/encodedock.ui
@@ -1913,6 +1913,182 @@ in temporal compression</string>
               </item>
              </layout>
             </widget>
+            <widget class="QWidget" name="metadataTab">
+             <attribute name="title">
+              <string>Metadata</string>
+             </attribute>
+             <layout class="QGridLayout" name="gridLayout_10">
+              <item row="0" column="0">
+               <widget class="QLabel" name="coverArtLabel">
+                <property name="text">
+                 <string>Cover Art</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="1">
+               <layout class="QHBoxLayout" name="horizontalLayout_26">
+                <item>
+                 <widget class="QLineEdit" name="coverArtLineEdit"/>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="coverArtButton">
+                  <property name="icon">
+                   <iconset theme="document-open" resource="../../icons/resources.qrc">
+                    <normaloff>:/icons/oxygen/32x32/actions/document-open.png</normaloff>:/icons/oxygen/32x32/actions/document-open.png</iconset>
+                  </property>
+                  <property name="text">
+                   <string/>
+                  </property>
+                  <property name="toolTip">
+                   <string>Browse for cover art image</string>
+                  </property>
+                  <property name="accessibleName">
+                   <string>Browse cover art</string>
+                  </property>
+                  <property name="accessibleDescription">
+                   <string>Open a file dialog to select a cover art image</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+              <item row="1" column="0">
+               <widget class="QLabel" name="metaTitleLabel">
+                <property name="text">
+                 <string>Title</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLineEdit" name="metaTitleLineEdit"/>
+              </item>
+              <item row="2" column="0">
+               <widget class="QLabel" name="metaArtistLabel">
+                <property name="text">
+                 <string>Artist</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QLineEdit" name="metaArtistLineEdit"/>
+              </item>
+              <item row="3" column="0">
+               <widget class="QLabel" name="metaCommentLabel">
+                <property name="text">
+                 <string>Comment</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="3" column="1">
+               <widget class="QLineEdit" name="metaCommentLineEdit"/>
+              </item>
+              <item row="4" column="0">
+               <widget class="QLabel" name="metaCopyrightLabel">
+                <property name="text">
+                 <string>Copyright</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="4" column="1">
+               <widget class="QLineEdit" name="metaCopyrightLineEdit"/>
+              </item>
+              <item row="5" column="0">
+               <widget class="QLabel" name="metaDateLabel">
+                <property name="text">
+                 <string>Date</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="5" column="1">
+               <widget class="QLineEdit" name="metaDateLineEdit">
+                <property name="placeholderText">
+                 <string>YYYY-MM-DD</string>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="0">
+               <widget class="QLabel" name="metaDescriptionLabel">
+                <property name="text">
+                 <string>Description</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="6" column="1">
+               <widget class="QLineEdit" name="metaDescriptionLineEdit"/>
+              </item>
+              <item row="7" column="0">
+               <widget class="QLabel" name="metaGenreLabel">
+                <property name="text">
+                 <string>Genre</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="7" column="1">
+               <widget class="QLineEdit" name="metaGenreLineEdit"/>
+              </item>
+              <item row="8" column="0">
+               <widget class="QLabel" name="metaLanguageLabel">
+                <property name="text">
+                 <string>Language</string>
+                </property>
+                <property name="alignment">
+                 <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+                </property>
+               </widget>
+              </item>
+              <item row="8" column="1">
+               <widget class="QLineEdit" name="metaLanguageLineEdit">
+                <property name="placeholderText">
+                 <string>eng</string>
+                </property>
+               </widget>
+              </item>
+              <item row="9" column="1">
+               <widget class="QCheckBox" name="disableSubtitlesCheckbox">
+                <property name="text">
+                 <string>Disable subtitles</string>
+                </property>
+               </widget>
+              </item>
+              <item row="10" column="1">
+               <spacer name="metadataVerticalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Orientation::Vertical</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </widget>
             <widget class="QWidget" name="otherTab">
              <attribute name="title">
               <string>Other</string>
@@ -1928,13 +2104,6 @@ in temporal compression</string>
                 </property>
                </widget>
               </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="disableSubtitlesCheckbox">
-                <property name="text">
-                 <string>Disable subtitles</string>
-                </property>
-               </widget>
-              </item>
              </layout>
             </widget>
            </widget>
@@ -2115,6 +2284,17 @@ in temporal compression</string>
   <tabstop>audioBitrateCombo</tabstop>
   <tabstop>audioQualitySpinner</tabstop>
   <tabstop>disableAudioCheckbox</tabstop>
+  <tabstop>coverArtLineEdit</tabstop>
+  <tabstop>coverArtButton</tabstop>
+  <tabstop>metaTitleLineEdit</tabstop>
+  <tabstop>metaArtistLineEdit</tabstop>
+  <tabstop>metaCommentLineEdit</tabstop>
+  <tabstop>metaCopyrightLineEdit</tabstop>
+  <tabstop>metaDateLineEdit</tabstop>
+  <tabstop>metaDescriptionLineEdit</tabstop>
+  <tabstop>metaGenreLineEdit</tabstop>
+  <tabstop>metaLanguageLineEdit</tabstop>
+  <tabstop>disableSubtitlesCheckbox</tabstop>
   <tabstop>advancedTextEdit</tabstop>
  </tabstops>
  <resources>