diff --git a/_service b/_service
index 1605a7b..786e1be 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">0.8.4</param>
-<param name="revision">v0.8.4</param>
+<param name="versionformat">0.8.5</param>
+<param name="revision">v0.8.5</param>
 </service>
 
 <service name="set_version" mode="disabled">
diff --git a/podman-0.8.4.tar.xz b/podman-0.8.4.tar.xz
deleted file mode 100644
index 05fb1ed..0000000
--- a/podman-0.8.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f16ee083ba487b9531c23b596fc804af11b6342c19d1f927826048f732bb99ee
-size 3229104
diff --git a/podman-0.8.5.tar.xz b/podman-0.8.5.tar.xz
new file mode 100644
index 0000000..f10e402
--- /dev/null
+++ b/podman-0.8.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69367eb55c52af37985ab97a6365007b2a8d39ac3b0f36518dfeec5bb664e456
+size 3237400
diff --git a/podman.changes b/podman.changes
index 38295ac..99abf2e 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Mon Sep  3 06:04:26 UTC 2018 - Valentin Rothberg <vrothberg@suse.com>
+
+- Changelog for v0.8.5 (2018-08-31)
+  * Add proper support for systemd inside of podman
+  * We are mistakenly seeing repos as registries.
+  * Up time between checks for podman wait
+  * Turn on test debugging
+  * Add support for remote commands
+  * fixup A few language changes and subuid(5)
+  * Make the documentation of user namespace options in podman-run clearer
+  * catch command-not-found errors
+  * don't print help message for usage errors
+  * docs: consistent format for example
+  * docs: consistent headings
+  * docs: make HISTORY consistent
+  * docs: fix headers
+  * varlink: fix --timeout usage
+  * run/create: reserve `-h` flag for hostname
+  * podman,varlink: inform user about --timeout 0
+  * rootless: show an error when stats is used
+  * rootless: show an error when pause/unpause are used
+  * rootless: unexport GetUserNSForPid
+  * rootless, exec: use the new function to join the userns
+  * rootless: fix top
+  * rootless: add new function to join existing namespace
+  * Do not set max open files by default if we are rootless
+  * Set default max open files in spec
+  * Resolve /etc/resolv.conf before reading
+  * document `--rm` semantics
+  * rootless, search: do not create a new userns
+  * rootless, login, logout: do not create a new userns
+  * rootless, kill: do not create a new userns
+  * rootless, stop: do not create a new userns
+  * Fix manpage to note how multiple filters are combined
+  * Fix handling of multiple filters in podman ps
+  * Fix Mount Propagation
+  * docs: add containers-mounts.conf(5)
+  * docs: use "containers-" prefix for registries and storage
+  * rootless: fix --pid=host
+  * rootless: fix --ipc=host
+  * spec: bind mount /sys only when userNS are enabled
+  * rootless, tests: add test for --uts=host
+  * rootless: don't use kill --all
+  * rootless: exec handle processes that create an user namespace
+  * rootless: fix exec
+
 -------------------------------------------------------------------
 Mon Aug 27 06:05:18 UTC 2018 - vrothberg@suse.com
 
@@ -288,7 +335,7 @@ Tue Jun  5 13:36:00 UTC 2018 - vrothberg@suse.com
   * fix panic with podman pull
   * Remove --net flag and make it an alias for --network
   * Clear all caps, except the bounding set, when --user is specified.
-    Fix: bsc#1097970
+    Fix: bsc#1097970 CVE-2018-10856
   * do not allow port related args to be used with --network=container:
   * sort containers and images by create time
   * Cleanup man pages
diff --git a/podman.spec b/podman.spec
index 75d97fc..f4f676c 100644
--- a/podman.spec
+++ b/podman.spec
@@ -24,7 +24,7 @@
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        0.8.4
+Version:        0.8.5
 Release:        0
 Summary:        Debugging tool for pods and images
 License:        Apache-2.0