diff --git a/.gitmodules b/.gitmodules
index 5a1b208ac8d..caace6555b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "idl"]
 	path = idl
-	url = https://github.com/uber/jaeger-idl.git
+	url = https://github.com/jaegertracing/jaeger-idl.git
 [submodule "jaeger-ui"]
 	path = jaeger-ui
-	url = https://github.com/uber/jaeger-ui
+	url = https://github.com/jaegertracing/jaeger-ui.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c656daa4b67..02d3fa32eed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,16 @@
 Changes by Version
 ==================
 
+TBD (pending)
+------------------
+
+#### UI Changes
+
+##### New Features
+
+- Timeline Expand and Collapse Features ([#221](https://github.com/jaegertracing/jaeger-ui/issues/221))
+- Integrate Google Analytics into Search Page ([#220](https://github.com/jaegertracing/jaeger-ui/issues/220))
+
 1.6.0 (2018-07-10)
 ------------------
 
diff --git a/Makefile b/Makefile
index 7b6e94d340a..3242773f309 100644
--- a/Makefile
+++ b/Makefile
@@ -173,8 +173,8 @@ docker-hotrod:
 
 .PHONY: build_ui
 build_ui: install-statik
-	cd jaeger-ui && yarn install && npm run build
-	(cd cmd/query/app/ui/actual; statik -f -src ../../../../../jaeger-ui/build)
+	cd jaeger-ui && yarn install && cd packages/jaeger-ui && yarn build
+	(cd cmd/query/app/ui/actual; statik -f -src ../../../../../jaeger-ui/packages/jaeger-ui/build)
 
 .PHONY: build-all-in-one-linux
 build-all-in-one-linux: build_ui
diff --git a/jaeger-ui b/jaeger-ui
index ba8349e6bf2..7896416c44d 160000
--- a/jaeger-ui
+++ b/jaeger-ui
@@ -1 +1 @@
-Subproject commit ba8349e6bf29f23802f3caa7e448731268b78224
+Subproject commit 7896416c44d1e4f1d452a7b67dcc43c9d5a2b853