diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a3204ec309..730bff56bb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changes by Version
 ==================
 
+0.6.0 (2017-08-09)
+------------------
+
+- Add viper/cobra configuration support [#245](https://github.com/uber/jaeger/pull/245) [#307](https://github.com/uber/jaeger/pull/307)
+- Add Zipkin /api/v1/spans endpoint [#282](https://github.com/uber/jaeger/pull/282)
+- Add basic authenticator to configs for cassandra [#323](https://github.com/uber/jaeger/pull/323)
+- Add Elasticsearch storage support
+
+
 0.5.2 (2017-07-20)
 ------------------
 
diff --git a/jaeger-ui b/jaeger-ui
index 4489f475b86..0753092645d 160000
--- a/jaeger-ui
+++ b/jaeger-ui
@@ -1 +1 @@
-Subproject commit 4489f475b863e472e6b4cbd681afce2ad32ee252
+Subproject commit 0753092645db12d898f5873807b5be7bba4ad90f