diff --git a/.buildah.metadata b/.buildah.metadata
index 139d86f..bf0fd50 100644
--- a/.buildah.metadata
+++ b/.buildah.metadata
@@ -1 +1 @@
-229662de7168fad3abe0ade5161880318105ddd0 SOURCES/v1.15.1.tar.gz
+8e153e6a28212f014b825b85359da1237c80acd1 SOURCES/release-1.16-aaed66b.tar.gz
diff --git a/.gitignore b/.gitignore
index ad6da9e..0067bec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.15.1.tar.gz
+SOURCES/release-1.16-aaed66b.tar.gz
diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec
index db8ed57..4c89ad7 100644
--- a/SPECS/buildah.spec
+++ b/SPECS/buildah.spec
@@ -11,25 +11,30 @@
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
 go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+%else
+%if ! 0%{?gobuild:1}
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
+%endif
 %endif
 
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo buildah
-# https://github.com/containers/buildah
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global git0 https://%{import_path}
-
-Name: %{repo}
-Version: 1.15.1
-Release: 2%{?dist}
+%global import_path github.com/containers/buildah
+%global branch release-1.16
+%global commit0 aaed66b76f01dd0097482afb85731e0c51af5b5b
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
+Name: buildah
+Version: 1.16.7
+Release: 4%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
 # Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
 ExcludeArch: i686
-Source0: %{git0}/archive/v%{version}.tar.gz
+%if 0%{?branch:1}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
+%endif
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: git
 BuildRequires: glib2-devel
@@ -69,14 +74,18 @@ Requires: httpd-tools
 This package contains system tests for %{name}
 
 %prep
-%autosetup -Sgit
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 sed -i 's/GOMD2MAN =/GOMD2MAN ?=/' docs/Makefile
 sed -i '/docs install/d' Makefile
 
 %build
 mkdir _build
 pushd _build
-mkdir -p src/%{provider}.%{provider_tld}/%{project}
+mkdir -p src/github.com/containers
 ln -s $(dirs +1 -l) src/%{import_path}
 popd
 
@@ -87,7 +96,7 @@ 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"
 rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go
-%gobuild -o %{name} %{import_path}/cmd/%{name}
+%gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 %gobuild -o imgtype %{import_path}/tests/imgtype
 GOMD2MAN=go-md2man %{__make} -C docs
 
@@ -117,6 +126,46 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 1.16.7-4
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.16
+  (https://github.com/containers/buildah/commit/aaed66b)
+- Related: #1888571
+
+* Mon Jan 11 2021 Jindrich Novy <jnovy@redhat.com> - 1.16.7-3
+- revert back to buildah-1.16 for the quarterly release
+- Related: #1888571
+
+* Sun Jan 10 2021 Jindrich Novy <jnovy@redhat.com> - 1.19.0-2
+- bump version to refrect buildah upgrade
+- Related: #1888571
+
+* Sat Jan 09 2021 Jindrich Novy <jnovy@redhat.com> - 1.16.7-2
+- bump to release-1.19 branch
+- Related: #1888571
+
+* Fri Dec 04 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-5
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.16
+  (https://github.com/containers/buildah/commit/56ed75b)
+- Related: #1888571
+
+* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-4
+- simplify spec file
+- use short commit ID in tarball name
+- Related: #1888571
+
+* Fri Oct 30 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-3
+- update to the latest content of https://github.com/containers/buildah/tree/release-1.16
+  (https://github.com/containers/buildah/commit/9e02bf9)
+- Related: #1888571
+
+* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-2
+- use shortcommit ID in branch tarball name
+- Related: #1888571
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1.16.5-1
+- synchronize with stream-container-tools-rhel8-rhel-8.4.0
+- Related: #1888571
+
 * Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 1.15.1-2
 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
 - Related: #1821193