diff --git a/CHANGELOG.md b/CHANGELOG.md
index f86f46d30d75..099a76174215 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,38 @@
 Changes by Version
 ==================
 
+1.1.0 (2-17-12-22)
+------------------
+
+#### Backend Changes
+
+##### New Features
+
+- Add CA certificates to collector/query images (#485)
+- Parse zipkin v2 high trace id (#596)
+
+##### Fixes
+
+- Skip nil and zero length hits in ElasticSearch storage (#601)
+- Make Cassandra service_name_index inserts idempotent (#587)
+- Align atomic int64 to word boundary to fix SIGSEGV (#592)
+
+#### UI Changes
+
+##### New Features
+
+- Change tag search input syntax to logfmt (https://github.com/jaegertracing/jaeger-ui/issues/145)
+- Make threshold for enabling DAG view configurable (https://github.com/jaegertracing/jaeger-ui/issues/130)
+- Show better error messages for failed API calls (https://github.com/jaegertracing/jaeger-ui/issues/127)
+
+##### Fixes
+
+- Use consistent icons for logs expanded/collapsed (https://github.com/jaegertracing/jaeger-ui/issues/86)
+- Encode service name in API calls to allow '/' (https://github.com/jaegertracing/jaeger-ui/issues/138)
+- Fix endless trace HTTP requests (https://github.com/jaegertracing/jaeger-ui/issues/128)
+- Fix JSON view when running in dev mode (https://github.com/jaegertracing/jaeger-ui/issues/139)
+- Fix trace name resolution (https://github.com/jaegertracing/jaeger-ui/pull/134)
+
 1.0.0 (2017-12-04)
 ------------------
 
diff --git a/jaeger-ui b/jaeger-ui
index 85f9822b20a2..b95786c1a5a1 160000
--- a/jaeger-ui
+++ b/jaeger-ui
@@ -1 +1 @@
-Subproject commit 85f9822b20a261950117c53ae120552e251d8f55
+Subproject commit b95786c1a5a16a6f0f3f5d59685284bce90b16d3