diff --git a/_service b/_service
index ccdf1ed..f7d9028 100644
--- a/_service
+++ b/_service
@@ -1,20 +1,16 @@
 <services>
-
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/containers/podman.git</param>
-<param name="scm">git</param>
-<param name="filename">podman</param>
-<param name="versionformat">3.0.1</param>
-<param name="revision">v3.0.1</param>
-</service>
-
-<service name="set_version" mode="disabled">
-<param name="basename">podman</param>
-</service>
-
-<service name="recompress" mode="disabled">
-<param name="file">*.tar</param>
-<param name="compression">xz</param>
-</service>
-
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/containers/podman.git</param>
+    <param name="scm">git</param>
+    <param name="revision">v3.1.0</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">enable</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+  </service>
+  <service mode="disabled" name="set_version">
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
 </services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..655e807
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/containers/podman.git</param>
+              <param name="changesrevision">9f09fb62cba8f44c18eda84db3e72aab3ae76046</param></service></servicedata>
\ No newline at end of file
diff --git a/podman-3.0.1.tar.xz b/podman-3.0.1.tar.xz
deleted file mode 100644
index feb36a1..0000000
--- a/podman-3.0.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77cbfc6aeea75ad5f1b4f7ba1eb2181220e7d8089ddb10fe13a03138bbb0386d
-size 6065188
diff --git a/podman-3.1.0.tar.xz b/podman-3.1.0.tar.xz
new file mode 100644
index 0000000..53d8aeb
--- /dev/null
+++ b/podman-3.1.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fa42ff76f1eba6ac499134c0d3f1c3f6c9b240abffe7df2467382b6dca6c324
+size 6052000
diff --git a/podman.changes b/podman.changes
index c1c5136..3db64c2 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Apr 09 16:55:51 UTC 2021 - alexandre.vicenzi@suse.com
+
+- Update to version 3.1.0:
+  * Bump to v3.1.0
+  * Fix test failure
+  * Update release notes for v3.1.0 final release
+  * [NO TESTS NEEDED] Turn on podman-remote build --isolation
+  * Fix long option format on docs.podman.io
+  * Fix containers list/prune http api filter behaviour
+  * [CI:DOCS] Add note to mappings for user/group userns in build
+  * Validate passed in timezone from tz option
+  * Generate Kubernetes PersistentVolumeClaims from named volumes
+  * libpod/image: unit tests: use a `registries.conf` for aliases
+- Require systemd 241 or newer due to podman dependency go-systemd v22,
+  otherwise build will fail with unknown C name errors
+
 -------------------------------------------------------------------
 Mon Mar 29 16:29:46 UTC 2021 - Frederic Crozat <fcrozat@suse.com>
 
diff --git a/podman.spec b/podman.spec
index 3eed94f..7969d0c 100644
--- a/podman.spec
+++ b/podman.spec
@@ -22,7 +22,7 @@
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and images
 License:        Apache-2.0
@@ -49,7 +49,11 @@ BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) = 1.13
 BuildRequires:  pkgconfig(libselinux)
-BuildRequires:  pkgconfig(libsystemd)
+# Podman 3.1.0 requires systemd 241 or newer due to go-systemd
+# see https://github.com/coreos/go-systemd/issues/355
+# The next Podman release won't need it probably
+# see https://github.com/coreos/go-systemd/pull/358
+BuildRequires:  pkgconfig(libsystemd) >= 241
 # Build fails with PIE enabled on ppc64le due to boo#1098017
 %ifarch ppc64le
 #!BuildIgnore: gcc-PIE
@@ -124,7 +128,7 @@ make %{?_smp_mflags} docs
 # Updates must be tested manually.
 
 %install
-make DESTDIR=%{buildroot} PREFIX=/usr install install.completions install.docker
+make DESTDIR=%{buildroot} PREFIX=/usr install install.completions install.docker install.docker-docs
 
 # packaged in libcontainers-common
 rm %{buildroot}/usr/share/man/man5/containers-mounts.conf.* %{buildroot}/usr/share/man/man5/oci-hooks.*