diff --git a/.buildah.metadata b/.buildah.metadata
index 31aa976..460ee6e 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-dd4893419d60984f0922ca888b0418b9fa09bd33 SOURCES/release-1.19-a2854ed.tar.gz
+e8bb60a940b812e4c0a5a9e1d060c08499faa4da SOURCES/release-1.21-9c83683.tar.gz
diff --git a/.gitignore b/.gitignore
index e39e388..cecb4ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/release-1.19-a2854ed.tar.gz
+SOURCES/release-1.21-9c83683.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index c64179b..6d52506 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -1,5 +1,3 @@
-%global with_bundled 1
-
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
 
@@ -13,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.19
-%global commit0 a2854ed5afc198009e44dfd16959865cf1144522
+%global branch release-1.21
+%global commit0 9c83683ac0e8a63474feef61ebcb7e8b973a26ef
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Name: buildah
-Version: 1.19.7
-Release: 2%{?dist}
+Version: 1.21.4
+Release: 1%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -93,9 +91,12 @@ export GOPATH=$(pwd)/_build:$(pwd)
 export BUILDTAGS='seccomp selinux btrfs_noversion exclude_graphdriver_btrfs'
 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
+%gobuild -o bin/copy %{import_path}/tests/copy
 GOMD2MAN=go-md2man %{__make} -C docs
 
 %install
@@ -104,6 +105,7 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
 cp -pav tests/. %{buildroot}/%{_datadir}/%{name}/test/system
 cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
+cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 
 #define license tag if not already defined
@@ -121,9 +123,27 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %files tests
 %license LICENSE
 %{_bindir}/%{name}-imgtype
+%{_bindir}/%{name}-copy
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Jul 27 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.4-1
+- add buildah-copy helper
+- Related: #1954702
+
+* Thu Jul 15 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.3-1
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.21
+  (https://github.com/containers/buildah/commit/7f9540d)
+- Related: #1954702
+
+* Thu Jul 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-2
+- "buildah version" produces correct output
+- Related: #1954702
+
+* Wed Jun 30 2021 Jindrich Novy <jnovy@redhat.com> - 1.21.1-1
+- update to buildah 1.21.1 from the release-1.21 upstream branch
+- Related: #1954702
+
 * Thu May 13 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.7-2
 - revert changes to the state of 3.0-8.4.0
 - Related: #1954702