diff --git a/src/plugins/git/changeselectiondialog.cpp b/src/plugins/git/changeselectiondialog.cpp
index 48f4cf9ccfd..43909108f89 100644
--- a/src/plugins/git/changeselectiondialog.cpp
+++ b/src/plugins/git/changeselectiondialog.cpp
@@ -83,6 +83,8 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
             this, &ChangeSelectionDialog::acceptRevert);
     connect(m_ui->checkoutButton, &QPushButton::clicked,
             this, &ChangeSelectionDialog::acceptCheckout);
+    connect(m_ui->archiveButton, &QPushButton::clicked,
+            this, &ChangeSelectionDialog::acceptArchive);
 
     if (id == "Git.Revert")
         m_ui->revertButton->setDefault(true);
@@ -90,6 +92,8 @@ ChangeSelectionDialog::ChangeSelectionDialog(const QString &workingDirectory, Co
         m_ui->cherryPickButton->setDefault(true);
     else if (id == "Git.Checkout")
         m_ui->checkoutButton->setDefault(true);
+    else if (id == "Git.Archive")
+        m_ui->archiveButton->setDefault(true);
     else
         m_ui->showButton->setDefault(true);
     m_changeModel = new QStringListModel(this);
@@ -147,6 +151,12 @@ ChangeCommand ChangeSelectionDialog::command() const
     return m_command;
 }
 
+void ChangeSelectionDialog::acceptArchive()
+{
+    m_command = Archive;
+    accept();
+}
+
 void ChangeSelectionDialog::acceptCheckout()
 {
     m_command = Checkout;
diff --git a/src/plugins/git/changeselectiondialog.h b/src/plugins/git/changeselectiondialog.h
index 1de142ac7d7..9c6290162a6 100644
--- a/src/plugins/git/changeselectiondialog.h
+++ b/src/plugins/git/changeselectiondialog.h
@@ -42,6 +42,7 @@ namespace Internal {
 
 enum ChangeCommand {
     NoCommand,
+    Archive,
     Checkout,
     CherryPick,
     Revert,
@@ -68,6 +69,7 @@ private:
     void recalculateCompletion();
     void recalculateDetails();
     void changeTextChanged(const QString &text);
+    void acceptArchive();
     void acceptCheckout();
     void acceptCherryPick();
     void acceptRevert();
diff --git a/src/plugins/git/changeselectiondialog.ui b/src/plugins/git/changeselectiondialog.ui
index 3ccd3f31eaa..b6db63a45a1 100644
--- a/src/plugins/git/changeselectiondialog.ui
+++ b/src/plugins/git/changeselectiondialog.ui
@@ -83,6 +83,13 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QPushButton" name="archiveButton">
+       <property name="text">
+        <string>&amp;Archive...</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="checkoutButton">
        <property name="text">
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index f95cda6e000..92bd78b6c6e 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -74,6 +74,7 @@
 #include <QAction>
 #include <QCoreApplication>
 #include <QDir>
+#include <QFileDialog>
 #include <QFileInfo>
 #include <QHash>
 #include <QMenu>
@@ -1086,6 +1087,49 @@ void GitClient::show(const QString &source, const QString &id, const QString &na
                                });
 }
 
+void GitClient::archive(const QString &workingDirectory, const QString &commit)
+{
+    QString repoDirectory = VcsManager::findTopLevelForDirectory(workingDirectory);
+    if (repoDirectory.isEmpty())
+        repoDirectory = workingDirectory;
+    QString repoName = QFileInfo(repoDirectory).fileName();
+
+    QHash<QString, QString> filters {
+        { tr("Tarball (*.tar.gz)"), ".tar.gz" },
+        { tr("Zip archive (*.zip)"), ".zip" }
+    };
+    QString selectedFilter;
+    if (HostOsInfo::isWindowsHost())
+        selectedFilter = filters.key(".zip");
+    else
+        selectedFilter = filters.key(".tar.gz");
+
+    QString archiveName = QFileDialog::getSaveFileName(
+                ICore::dialogParent(),
+                tr("Generate %1 archive").arg(repoName),
+                repoDirectory + QString("/%1-%2").arg(repoName).arg(commit.left(8)),
+                filters.keys().join(";;"),
+                &selectedFilter);
+    if (archiveName.isEmpty())
+        return;
+    QString extension = filters.value(selectedFilter);
+    QFileInfo archive(archiveName);
+    if (archive.completeSuffix() != extension) {
+        archive = QFileInfo(archive.absoluteDir().absoluteFilePath(archive.baseName() + extension));
+    }
+
+    if (archive.exists()) {
+        if (QMessageBox::warning(ICore::dialogParent(), tr("Overwrite?"),
+            tr("An item named \"%1\" already exists at this location. "
+               "Do you want to overwrite it?").arg(QDir::toNativeSeparators(archive.absoluteFilePath())),
+            QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) {
+            return;
+        }
+    }
+
+    vcsExec(workingDirectory, {"archive", commit, "-o", archive.absoluteFilePath()}, nullptr, true);
+}
+
 VcsBaseEditorWidget *GitClient::annotate(
         const QString &workingDir, const QString &file, const QString &revision,
         int lineNumber, const QStringList &extraOptions)
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index abde02f40da..2c67f87d96a 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -326,6 +326,7 @@ public:
     static QString msgNoChangedFiles();
     static QString msgNoCommits(bool includeRemote);
     void show(const QString &source, const QString &id, const QString &name = QString());
+    void archive(const QString &workingDirectory, const QString &commit);
 
 private:
     void finishSubmoduleUpdate();
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 924f1da5e22..db3154e4997 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -588,6 +588,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
     createChangeRelatedRepositoryAction(tr("Revert..."), "Git.Revert", context);
     createChangeRelatedRepositoryAction(tr("Cherry Pick..."), "Git.CherryPick", context);
     createChangeRelatedRepositoryAction(tr("Checkout..."), "Git.Checkout", context);
+    createChangeRelatedRepositoryAction(tr("Archive..."), "Git.Archive", context);
 
     createRepositoryAction(nullptr, tr("Rebase..."), "Git.Rebase", context, true,
                            std::bind(&GitPlugin::branchList, this));
@@ -852,6 +853,9 @@ void GitPlugin::startChangeRelatedAction(const Id &id)
     if (dialog.command() == Show) {
         m_gitClient->show(workingDirectory, change);
         return;
+    } else if (dialog.command() == Archive) {
+        m_gitClient->archive(workingDirectory, change);
+        return;
     }
 
     if (!DocumentManager::saveAllModifiedDocuments())