diff --git a/_service b/_service
index 7ec65a7..14c59a6 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
 <param name="url">https://github.com/containers/libpod.git</param>
 <param name="scm">git</param>
 <param name="filename">podman</param>
-<param name="versionformat">1.3.1</param>
-<param name="revision">v1.3.1</param>
+<param name="versionformat">1.4.0</param>
+<param name="revision">v1.4.0</param>
 </service>
 
 <service name="set_version" mode="disabled">
diff --git a/libpod.conf b/libpod.conf
index 9cf1a95..1091c91 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -90,6 +90,10 @@ num_locks = 2048
 # Uncomment to change location from this default.
 #volume_path = "/var/lib/containers/storage/volumes"
 
+# Selects which logging mechanism to use for Podman events.  Valid values
+# are `journald` or `file`.
+# events_logger = "journald"
+
 # Default OCI runtime
 runtime = "runc"
 
@@ -100,6 +104,8 @@ runc = [
   "/usr/sbin/runc"
 ]
 
-# Selects which logging mechanism to use for Podman events.  Valid values
-# are `journald` or `file`.
-# events_logger = "journald"
+# The [runtimes] table MUST be the last thing in this file.
+# (Unless another table is added)
+# TOML does not provide a way to end a table other than a further table being
+# defined, so every key hereafter will be part of [runtimes] and not the main
+# config.
diff --git a/podman-1.3.1.tar.xz b/podman-1.3.1.tar.xz
deleted file mode 100644
index d5103c1..0000000
--- a/podman-1.3.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b204dd3ebc519d0bd13624c2411e9dbfc0c4895cddc99239581c2ff44bc50d5
-size 3812924
diff --git a/podman-1.4.0.tar.xz b/podman-1.4.0.tar.xz
new file mode 100644
index 0000000..812dfbf
--- /dev/null
+++ b/podman-1.4.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32b65555598b03ba839939e776d211700a3fdd4728129d25b406c528d7a8fc22
+size 3828576
diff --git a/podman.changes b/podman.changes
index 94bb760..aee4583 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,70 @@
+-------------------------------------------------------------------
+Tue Jun 11 06:43:28 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Update podman to v1.4.0:
+  - The podman checkpoint and podman restore commands can now be
+    used to migrate containers between Podman installations on
+    different systems
+  - The podman cp command now supports a pause flag to pause
+    containers while copying into them
+  - The remote client now supports a configuration file for
+    pre-configuring connections to remote Podman installations
+  - Fixed CVE-2019-10152 - The podman cp command improperly
+    dereferenced symlinks in host context
+  - Fixed a bug where podman commit could improperly set
+    environment variables that contained = characters
+  - Fixed a bug where rootless Podman would sometimes fail to start
+    containers with forwarded ports
+  - Fixed a bug where podman version on the remote client could
+    segfault
+  - Fixed a bug where podman container runlabel would use
+    /proc/self/exe instead of the path of the Podman command when
+    printing the command being executed
+  - Fixed a bug where filtering images by label did not work
+  - Fixed a bug where specifying a bing mount or tmpfs mount over
+    an image volume would cause a container to be unable to start
+  - Fixed a bug where podman generate kube did not work with
+    containers with named volumes
+  - Fixed a bug where rootless Podman would receive permission
+    denied errors accessing conmon.pid
+  - Fixed a bug where podman cp with a folder specified as target
+    would replace the folder, as opposed to copying into it
+  - Fixed a bug where rootless Podman commands could double-unlock
+    a lock, causing a crash
+  - Fixed a bug where Podman incorrectly set tmpcopyup on /dev/
+    mounts, causing errors when using the Kata containers runtime
+  - Fixed a bug where podman exec would fail on older kernels
+  - The podman commit command is now usable with the Podman remote
+    client
+  - The --signature-policy flag (used with several image-related
+    commands) has been deprecated
+  - The podman unshare command now defines two environment
+    variables in the spawned shell: CONTAINERS_RUNROOT and
+    CONTAINERS_GRAPHROOT, pointing to temporary and permanent
+    storage for rootless containers
+  - Updated vendored containers/storage and containers/image
+    libraries with numerous bugfixes
+  - Updated vendored Buildah to v1.8.3
+  - Podman now requires Conmon v0.2.0
+  - The podman cp command is now aliased as podman container cp
+  - Rootless Podman will now default init_path using root Podman's
+    configuration files (/etc/containers/libpod.conf and
+    /usr/share/containers/libpod.conf) if not overridden in the
+    rootless configuration
+
+-------------------------------------------------------------------
+Fri Jun  7 11:48:27 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Add fuse-overlayfs dependency to support overlay based rootless image
+  manipulations
+
+-------------------------------------------------------------------
+Wed May 29 14:16:08 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Update podman to v1.3.2:
+  - Fixed a bug where podman would fail to run if a volume was
+    mounted over an image volume
+
 -------------------------------------------------------------------
 Wed May 22 07:04:24 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
 
diff --git a/podman.spec b/podman.spec
index c72f9d4..3b18784 100644
--- a/podman.spec
+++ b/podman.spec
@@ -24,7 +24,7 @@
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        1.3.1
+Version:        1.4.0
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and images
 License:        Apache-2.0
@@ -67,6 +67,7 @@ Requires:       libcontainers-storage
 Requires:       runc >= 1.0.0~rc4
 Requires:       slirp4netns
 Requires:       catatonit
+Requires:       fuse-overlayfs
 Recommends:     %{name}-cni-config = %{version}
 %{go_nostrip}
 %if 0%{?with_libostree}