diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15f3ae2..a6dacc6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,66 @@
+## Release 0.5.4 (2017-08-25)
+
+```
+Baseline: 6563b2d42d29196432d5fcafa0144b8371fbb028
+
+Cherry picks:
+   + d4fa181f8607c35230b7efa1ce94188b51508962:
+     Use getExecPathString when getting bash_main_file
+   + 837e1b3d4859140d29aaa6bbab8fbb008e6d701e:
+     Windows, sh_bin. launcher: export runfiles envvars
+   + fe9ba893c0ebec19228086356af5fa8d81f2809b:
+     grpc: Consolidate gRPC code from BES and Remote Execution. Fixes
+     #3460, #3486
+   + e8d4366cd374fba92f1425de0d475411c8defda4:
+     Automated rollback of commit
+     496d3ded0bce12b7371a93e1183ba30e6aa88032.
+   + 242a43449dd44a22857f6ce95f7cc6a7e134d298:
+     bes,remote: update default auth scope.
+   + 793b409eeae2b42be7fed58251afa87b5733ca4d:
+     Windows, sh_bin. launcher: fix manifest path
+   + 7e4fbbe4ab3915a57b2187408c3909e5cd6c6013:
+     Add --windows_exe_launcher option
+   + 91fb38e92ace6cf14ce5da6527d71320b4e3f3d2:
+     remote_worker: Serialize fork() calls. Fixes #3356
+   + b79a9fcd40f448d3aebb2b93a2ebe80d09b38408:
+     Quote python_path and launcher in
+     python_stub_template_windows.txt
+   + 4a2e17f85fc8450aa084b201c5f24b30010c5987:
+     Add build_windows_jni.sh back
+   + ce61d638197251f71ed90db74843b55d9c2e9ae5:
+     don't use methods and classes removed in upstream dx RELNOTES:
+     update dexing tools to Android SDK 26.0.1
+   + 5393a4996d701fa192964a35cbb75e558a0599c0:
+     Make Bazel enforce requirement on build-tools 26.0.1 or later.
+   + 5fac03570f80856c063c6019f5beb3bdc1672dee:
+     Fix --verbose_failures w/ sandboxing to print the full command
+     line
+   + f7bd1acf1f96bb7e3e19edb9483d9e07eb5af070:
+     Only patch in C++ compile features when they are not already
+     defined in crosstool
+   + d7f5c120417bc2d2344dfb285322355f225d9153:
+     Bump python-gflags to 3.1.0, take two
+   + 3cb136d5451e9d8af58f9a99990cad0592df101a:
+     Add python to bazel's dockerfiles
+```
+
+New features:
+
+  - Do not disable fully dynamic linking with ThinLTO when invoked
+    via LIPO options.
+
+Important changes:
+
+  - Ignore --glibc in the Android transition.
+  - Remove --experimental_android_use_singlejar_for_multidex.
+  - nocopts now also filter copts
+  - The Build Event Service (BES) client now properly supports
+    Google Applicaton Default Credentials.
+  - update dexing tools to Android SDK 26.0.1
+  - Bazel Android support now requires build-tools 26.0.1 or later.
+  - Fix a bug in the remote_worker that would at times make it crash on Linux. See #3356
+  - The java_proto_library rule now supports generated sources. See #2265
+
 ## Release 0.5.3 (2017-07-27)
 
 ```
@@ -1619,3 +1682,4 @@
 
 
 
+