diff --git a/cli/mainfeatures.cpp b/cli/mainfeatures.cpp
index 1c3ea31..ad20bba 100644
--- a/cli/mainfeatures.cpp
+++ b/cli/mainfeatures.cpp
@@ -221,7 +221,7 @@ void displayFileInfo(
                 printProperty("Duration", duration);
                 printProperty("Overall avg. bitrate", bitrateToString(fileInfo.overallAverageBitrate()));
             }
-            if (const auto container = fileInfo.container()) {
+            if (const auto *const container = fileInfo.container()) {
                 size_t segmentIndex = 0;
                 for (const auto &title : container->titles()) {
                     if (segmentIndex) {
@@ -240,6 +240,12 @@ void displayFileInfo(
                 printProperty("Modification time", container->modificationTime());
                 printProperty("Tag position", container->determineTagPosition(diag));
                 printProperty("Index position", container->determineIndexPosition(diag));
+                if (const auto &muxingApps = container->muxingApplications(); !muxingApps.empty()) {
+                    printProperty("Muxing application", joinStrings(muxingApps, ", "));
+                }
+                if (const auto &writingApps = container->writingApplications(); !writingApps.empty()) {
+                    printProperty("Writing application", joinStrings(writingApps, ", "));
+                }
             }
             if (fileInfo.paddingSize()) {
                 printProperty("Padding", dataSizeToString(fileInfo.paddingSize()));
diff --git a/gui/fileinfomodel.cpp b/gui/fileinfomodel.cpp
index e210595..5114f59 100644
--- a/gui/fileinfomodel.cpp
+++ b/gui/fileinfomodel.cpp
@@ -340,6 +340,13 @@ void FileInfoModel::updateCache()
         containerHelper.appendRow(tr("Document read version"), container->doctypeReadVersion());
         containerHelper.appendRow(tr("Tag position"), Utility::elementPositionToQString(container->determineTagPosition(diag)));
         containerHelper.appendRow(tr("Index position"), Utility::elementPositionToQString(container->determineIndexPosition(diag)));
+        const auto *const constContainer = container;
+        if (const auto &muxingApps = constContainer->muxingApplications(); !muxingApps.empty()) {
+            containerHelper.appendRow(tr("Muxing application"), qstr(joinStrings(muxingApps, ", ")));
+        }
+        if (const auto &writingApps = constContainer->writingApplications(); !writingApps.empty()) {
+            containerHelper.appendRow(tr("Writing application"), qstr(joinStrings(writingApps, ", ")));
+        }
     }
     containerHelper.appendRow(tr("Padding size"), m_file->paddingSize());
 
diff --git a/misc/htmlinfo.cpp b/misc/htmlinfo.cpp
index dbbd560..daafdc5 100644
--- a/misc/htmlinfo.cpp
+++ b/misc/htmlinfo.cpp
@@ -958,6 +958,13 @@ public:
                 }
                 rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Tag position"), container->determineTagPosition(m_diagReparsing));
                 rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Index position"), container->determineIndexPosition(m_diagReparsing));
+                const auto *const constContainer = container;
+                if (const auto &muxingApps = constContainer->muxingApplications(); !muxingApps.empty()) {
+                    rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Muxing application"), qstr(joinStrings(muxingApps, ", ")));
+                }
+                if (const auto &writingApps = constContainer->writingApplications(); !writingApps.empty()) {
+                    rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Writing application"), qstr(joinStrings(writingApps, ", ")));
+                }
             }
             if (m_file.paddingSize()) {
                 rowMaker.mkRow(QCoreApplication::translate("HtmlInfo", "Padding size"),