diff --git a/.gitignore b/.gitignore
index 993b37f..154883d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+SOURCES/master-e523d09.tar.gz
 SOURCES/v0.1.5.tar.gz
 SOURCES/v1.1.1.tar.gz
-SOURCES/v3.0-745fa4a.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 6a0f986..ac5e2fe 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,3 @@
+c866c47a818df391dde2d90cde5f924730ce6e88 SOURCES/master-e523d09.tar.gz
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
 3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
-6e7caf5a0cbc15f8c44b94452cad10051eeb621a SOURCES/v3.0-745fa4a.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 8406301..79cf2c1 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -13,15 +13,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %endif
 
 %global import_path github.com/containers/podman
-%global branch v3.0
-%global commit0 745fa4ac94c3ec99becd85f59d1b59c2c9765527
+%global branch master
+%global commit0 e523d09638b05edfd51538ac5786f00793e396ee
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 %global dnsnamever 1.1.1
 
 Name: podman
-Version: 3.0.0
-Release: 0.33rc2%{?dist}
+Version: 3.1.0
+Release: 0.13%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -32,12 +32,8 @@ Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcom
 %endif
 Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
 Source2: https://github.com/containers/dnsname/archive/v%{dnsnamever}.tar.gz
-#Patch1: https://patch-diff.githubusercontent.com/raw/containers/podman/pull/8561.patch
 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
-#ExclusiveArch: %%{go_arches}
-# still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
-ExcludeArch: %{ix86}
+ExclusiveArch: %{go_arches}
 Provides: %{name}-manpages = %{version}-%{release}
 Obsoletes: %{name}-manpages < %{version}-%{release}
 BuildRequires: golang >= 1.12.12-4
@@ -74,6 +70,7 @@ Requires: slirp4netns >= 0.4.0-1
 Requires: runc >= 1.0.0-57
 Requires: fuse-overlayfs
 Requires: %{name}-catatonit >= %{version}-%{release}
+Requires: oci-runtime
 
 %description
 %{name} (Pod Manager) is a fully featured container engine that is a simple
@@ -308,7 +305,6 @@ exit 0
 
 %files docker
 %{_bindir}/docker
-%{_mandir}/man1/docker*.1*
 %{_usr}/lib/tmpfiles.d/%{name}-docker.conf
 
 %files remote
@@ -341,6 +337,151 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Mar 25 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.13
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e523d09)
+- Related: #1934415
+
+* Wed Mar 24 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.12
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/860de13)
+- Related: #1934415
+
+* Tue Mar 23 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.11
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/60c90c3)
+- Related: #1934415
+
+* Mon Mar 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.10
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/ebc9871)
+- Related: #1934415
+
+* Fri Mar 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.9
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/5d9b070)
+- Related: #1934415
+
+* Thu Mar 18 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.8
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/6f6cc1c)
+- Related: #1934415
+
+* Wed Mar 17 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.7
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/604459b)
+- Related: #1934415
+
+* Tue Mar 16 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.6
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e7dc592)
+- Related: #1934415
+
+* Mon Mar 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.5
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/fc02d16)
+- Related: #1934415
+
+* Fri Mar 12 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.4
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/81737b3)
+- Related: #1934415
+
+* Thu Mar 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.3
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/e2d35e5)
+- Related: #1934415
+
+* Wed Mar 10 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.2
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/09473d4)
+- Related: #1934415
+
+* Tue Mar 09 2021 Jindrich Novy <jnovy@redhat.com> - 3.1.0-0.1
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/789d579)
+- Related: #1934415
+
+* Mon Mar 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-6
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/b7c00f2)
+- Related: #1934415
+
+* Thu Mar 04 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-5
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/87e2056)
+- Related: #1934415
+
+* Wed Mar 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-4
+- remove docker man page as it was removed upstream
+- Related: #1934415
+
+* Wed Mar 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-3
+- update to the latest content of https://github.com/containers/podman/tree/master
+  (https://github.com/containers/podman/commit/0a40c5a)
+- Related: #1934415
+
+* Mon Feb 22 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/9a2fc37)
+- Related: #1883490
+
+* Fri Feb 19 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/7e286bc)
+- Related: #1883490
+
+* Mon Feb 15 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/797f1ea)
+- Related: #1883490
+
+* Fri Feb 12 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-1
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/ddd8a17)
+- Related: #1883490
+
+* Wed Feb 10 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.41rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/2b89fe7)
+- Related: #1883490
+
+* Tue Feb 09 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.40rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/a5ab59e)
+- Related: #1883490
+
+* Sat Feb 06 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.39rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/288fb68)
+- Resolves: #1883490
+
+* Thu Feb 04 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.38rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/82081e8)
+- Related: #1883490
+
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.37rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/c2a298e)
+- Related: #1883490
+
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.36rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/013770e)
+- Related: #1883490
+
+* Wed Feb 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.35rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/978c005)
+- Related: #1883490
+
+* Tue Feb 02 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.34rc2
+- update to the latest content of https://github.com/containers/podman/tree/v3.0
+  (https://github.com/containers/podman/commit/67d48c5)
+- add Requires: oci-runtime
+- Related: #1883490
+
 * Sun Jan 31 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.0-0.33rc2
 - update to the latest content of https://github.com/containers/podman/tree/v3.0
   (https://github.com/containers/podman/commit/745fa4a)