diff --git a/_service b/_service
index d84f67c..4cb32c6 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
 <param name="url">https://github.com/projectatomic/libpod.git</param>
 <param name="scm">git</param>
 <param name="filename">podman</param>
-<param name="versionformat">0.5.4</param>
-<param name="revision">v0.5.4</param>
+<param name="versionformat">0.6.1</param>
+<param name="revision">v0.6.1</param>
 </service>
 
 <service name="recompress" mode="disabled">
diff --git a/podman-0.5.4.tar.xz b/podman-0.5.4.tar.xz
deleted file mode 100644
index cc5120f..0000000
--- a/podman-0.5.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ceb7a3013876e7a2cf0b15896be23acda2659ea23e9b95e466cba1dd22e8975
-size 2996720
diff --git a/podman-0.6.1.tar.xz b/podman-0.6.1.tar.xz
new file mode 100644
index 0000000..c710669
--- /dev/null
+++ b/podman-0.6.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd6364cdf87c002de520999c9adf76bca05a981daf5903bb732ba97a90e19d88
+size 2998652
diff --git a/podman.changes b/podman.changes
index bcf58ae..b0c7e00 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Jun  5 13:36:00 UTC 2018 - vrothberg@suse.com
+
+- Changelog for v0.6.1 (2018-06-01)
+  * Fix lable handling
+  * runtime: add /usr/libexec/podman/conmon to the conmon paths
+  * varlink build
+  * Add OnBuild support for podman build
+  * return all inspect info for varlink containerinspect
+  * hooks/exec: Allow successful reaps for 0s post-kill timeouts
+  * 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.
+  * do not allow port related args to be used with --network=container:
+  * sort containers and images by create time
+  * Cleanup man pages
+
 -------------------------------------------------------------------
 Tue May 29 12:35:47 UTC 2018 - parlt@suse.com
 
diff --git a/podman.spec b/podman.spec
index bf711ba..bb2b53d 100644
--- a/podman.spec
+++ b/podman.spec
@@ -22,7 +22,7 @@
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        0.5.4
+Version:        0.6.1
 Release:        0
 Summary:        Debugging tool for pods and images
 License:        Apache-2.0
@@ -104,6 +104,8 @@ export BUILDTAGS="seccomp apparmor containers_image_ostree_stub"
 %endif
 
 # Build podman
+go generate ./cmd/podman/varlink/...
+
 go build -tags "$BUILDTAGS" \
          -i -ldflags '-s -w -X main.podmanVersion=%{version}' \
          -o bin/podman \