diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa50520..4fd1cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 * Improve `docker version --format` option when the client has downgraded the API version [#31022](https://github.com/docker/docker/pull/31022)
 * Prompt when using an encrypted client certificate to connect to a docker daemon [#31364](https://github.com/docker/docker/pull/31364)
 * Display created tags on successful `docker build` [#32077](https://github.com/docker/docker/pull/32077)
+* Cleanup compose convert error messages [#32087](https://github.com/moby/moby/pull/32087)
 
 ### Contrib
 
diff --git a/VERSION b/VERSION
index c3337a2..0c15909 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.05.0-ce-rc1
+17.05.0-ce-rc2