diff --git a/buildah.spec b/buildah.spec
index ca748e8..b49863a 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -14,13 +14,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/buildah
-%global branch main
-%global commit0 ecfcde24a1222a2ba1252e82d2c37e6bce6bdb72
+%global branch release-1.21
+%global commit0 af2a1d4d762a627e01a87f4aab4dd0c1876df6b6
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: buildah
-Version: 1.22.0
-Release: 0.17%{?dist}
+Version: 1.21.1
+Release: 1%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -96,7 +96,6 @@ export GO111MODULE=off
 export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="$LDFLAGS -X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
-
 rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o imgtype %{import_path}/tests/imgtype
@@ -128,6 +127,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-1
+- update to buildah 1.21.1 from the release-1.21 upstream branch
+- Related: #1970747
+
 * Wed Jun 30 2021 Jindrich Novy <jnovy@redhat.com> - 1.22.0-0.17
 - update to the latest content of https://github.com/containers/buildah/tree/main
   (https://github.com/containers/buildah/commit/ecfcde2)
diff --git a/sources b/sources
index 688df72..e74675b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (main-ecfcde2.tar.gz) = 6dbc5bb82e5e0ea5076a5bda42bccd16de6df0fb4270a0efdd791b621bd0df845bc72e453e163e851506a4483c8f3af63359d5f4747d8ce6217a56435481386a
+SHA512 (release-1.21-af2a1d4.tar.gz) = fc6acdefe98133776900e2f6e323b8720dcf110b350a2ff60a4c86080e5cdd5615f9d064113974093be3a21da776677d23016961ca1dfbb1cf8ac7da95bcbfbd