diff --git a/.gitignore b/.gitignore
index a88ca56..03328d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /tmt-0.18.tar.gz
 /tmt-0.19.tar.gz
 /tmt-0.20.tar.gz
+/tmt-0.21.tar.gz
diff --git a/sources b/sources
index 6be4b89..850dc15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tmt-0.20.tar.gz) = d07758d3a6e8919f4b185107fa4be2dd47384a5c888af4525b336cf961526681594c4a708706b06af1983709aadfcae96584c5c957cafa809bf996a549647131
+SHA512 (tmt-0.21.tar.gz) = d056db640d3ee45125ee875b0ddb0acc6fa202a6da3a2ff95e858ef433ebd79538b0e62bd7dd81f0192479bff575a38c800e60006133015ca7e704586666fdb3
diff --git a/tmt.spec b/tmt.spec
index d9e754d..27b01b1 100644
--- a/tmt.spec
+++ b/tmt.spec
@@ -1,10 +1,11 @@
 Name: tmt
-Version: 0.20
+Version: 0.21
 Release: 1%{?dist}
 
 Summary: Test Management Tool
 License: MIT
 BuildArch: noarch
+%{?kernel_arches:ExclusiveArch: %{kernel_arches} noarch}
 
 URL: https://github.com/psss/tmt
 Source0: https://github.com/psss/tmt/releases/download/%{version}/tmt-%{version}.tar.gz
@@ -75,13 +76,19 @@ Requires: ansible openssh-clients rsync
 %description provision-virtual
 Dependencies required to run tests in a local virtual machine.
 
+%package test-convert
+Summary: Test import and export dependencies
+Requires: make python3-nitrate python3-html2text
+
+%description test-convert
+Additional dependencies needed for test metadata import and export.
+
 %package all
 Summary: Extra dependencies for the Test Management Tool
 Requires: tmt >= %{version}
 Requires: tmt-provision-container >= %{version}
 Requires: tmt-provision-virtual >= %{version}
-Requires: python3-nitrate make
-Recommends: vagrant
+Requires: tmt-test-convert >= %{version}
 
 %description all
 All extra dependencies of the Test Management Tool. Install this
@@ -143,11 +150,39 @@ export LANG=en_US.utf-8
 %files provision-virtual
 %{python3_sitelib}/%{name}/steps/provision/{,__pycache__/}testcloud.*
 
+%files test-convert
+%license LICENSE
+
 %files all
 %license LICENSE
 
 
 %changelog
+* Mon Sep 07 2020 Petr Šplíchal <psplicha@redhat.com> - 0.21-1
+- Adjust manual test case import from nitrate [#319]
+- Move the test convert deps into a separate package
+- Support importing manual test cases from Nitrate
+- Merge the non-zero exit codes for linting errors
+- Fix several test export issues [fix #337]
+- Adjust distro checks, remove the dry parameter
+- Generalized Guest.details() [fix #310]
+- Adjust the test coverage for tmt plan/test lint
+- Update documentation with virtualization tips
+- Make sure the duration timer is always canceled
+- Merge the new retry_session functionality [#328]
+- Exit with non-zero code if linting fails
+- Merge fix for the double fmf extension [#327]
+- Prevent koji from trying to build packages on i686
+- Retry requests in case of network failure
+- Avoid double fmf extension when creating plans and stories
+- Improve the maximum test duration handling
+- Remove vagrant from tmt-all recommended packages
+- Detect beakerlib libraries from recommend as well
+- Simplify packit custom create archive command
+- Make the httpd test example a bit more interesting
+- Append dots to fix tmt run --help message summary
+- Document multiple configs and extending steps
+
 * Tue Jul 28 2020 Petr Šplíchal <psplicha@redhat.com> - 0.20-1
 - Move libraries handling into a separate module
 - Adjust loading variables from YAML files [#316]