diff --git a/.gitignore b/.gitignore
index 41ac423..e36b805 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/v0.1.5.tar.gz
-SOURCES/v1.0.0.tar.gz
-SOURCES/v2.1.1-rhel-450615a.tar.gz
+SOURCES/v1.1.1.tar.gz
+SOURCES/v2.2.1-rhel-a0d478e.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index b66b51d..6cea6f9 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,3 @@
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
-a6c091c91a7d67ef45fba5526351285349880c4b SOURCES/v1.0.0.tar.gz
-a15f7a3808d48abec9b5ff7d8f930814bede6c86 SOURCES/v2.1.1-rhel-450615a.tar.gz
+3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
+f9f43ae663aa1cae1936a9580f8009c292259b59 SOURCES/v2.2.1-rhel-a0d478e.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 698b18e..f7ead48 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -13,23 +13,23 @@
 
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
-go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
 %else
 %if ! 0%{?gobuild:1}
-%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -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 %{?**};
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -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 %{?**};
 %endif
 %endif
 
 %global import_path github.com/containers/podman
-%global branch v2.1.1-rhel
-%global commit0 450615ae0bce647c10b8e3c774818b1c10dc8224
+%global branch v2.2.1-rhel
+%global commit0 a0d478edea7f775b7ce32f8eb1a01e75374486cb
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
-%global dnsnamever 1.0.0
+%global dnsnamever 1.1.1
 
 Name: podman
-Version: 2.1.1
-Release: 3%{?dist}
+Version: 2.2.1
+Release: 2%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -308,10 +308,12 @@ exit 0
 %license LICENSE
 %doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md transfer.md
 %{_bindir}/%{name}
-%{_datadir}/bash-completion/completions/*
+%{_datadir}/bash-completion/completions/%{name}
 # By "owning" the site-functions dir, we don't need to Require zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_%{name}
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/%{name}.fish
 %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}.socket
@@ -335,8 +337,16 @@ exit 0
 %{_usr}/lib/tmpfiles.d/%{name}-docker.conf
 
 %files remote
+%license LICENSE
 %{_bindir}/%{name}-remote
-%{_mandir}/man1/%{name}-remote*.1*
+%{_mandir}/man1/%{name}-remote*.*
+%{_datadir}/bash-completion/completions/%{name}-remote
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_completions.d
+%{_datadir}/fish/vendor_completions.d/%{name}-remote.fish
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_%{name}-remote
 
 %files catatonit
 %license COPYING
@@ -356,6 +366,22 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.1-2
+- update to https://github.com/containers/dnsname/releases/tag/v1.1.1
+
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.1-1
+- update to the latest content of https://github.com/containers/podman/tree/v2.2.1-rhel
+  (https://github.com/containers/podman/commit/a0d478e)
+- Related: #1888571
+
+* Thu Dec 03 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.0-2
+- attempt to fix gatng tests
+- Related: #1888571
+
+* Wed Dec 02 2020 Jindrich Novy <jnovy@redhat.com> - 2.2.0-1
+- update to https://github.com/containers/podman/releases/tag/v2.2.0
+- Related: #1888571
+
 * Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 2.1.1-3
 - attempt to fix linker error with golang-1.15
 - add Requires: httpd-tools to tests, needed to work around