diff --git a/.buildah.metadata b/.buildah.metadata
index 460ee6e..91313c4 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-e8bb60a940b812e4c0a5a9e1d060c08499faa4da SOURCES/release-1.21-9c83683.tar.gz
+327fd4330a3f123410d695a50b466d746b4d23a7 SOURCES/main-42dbc97.tar.gz
diff --git a/.gitignore b/.gitignore
index cecb4ae..431d8cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/release-1.21-9c83683.tar.gz
+SOURCES/main-42dbc97.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index 193b719..144baaf 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -11,13 +11,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/buildah
-%global branch release-1.21
-%global commit0 9c83683ac0e8a63474feef61ebcb7e8b973a26ef
+%global branch main
+%global commit0 42dbc976287676a7a188a3e60a715c49e62bc036
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: buildah
-Version: 1.21.4
-Release: 2%{?dist}
+Version: 1.22.0
+Release: 0.2%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -127,6 +127,20 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.2
+- update to the latest content of https://github.com/containers/buildah/tree/main
+  (https://github.com/containers/buildah/commit/42dbc97)
+- Related: #1934415
+
+* Wed Jul 28 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.0-1
+- update to the latest content of https://github.com/containers/buildah/tree/main
+  (https://github.com/containers/buildah/commit/42dbc97)
+- Related: #1934415
+
+* Tue Jul 27 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.1
+- switch to main branch
+- Related: #1934415
+
 * Mon Jul 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.4-2
 - add buildah-copy helper
 - Related: #1934415