diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40a5be0f35..af6f2a1c2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [1.8.7] - 2020-07-21
+### Fixed
+- Add back support for DEFAULT_SSHHOST env var in shell app [#603](https://github.com/OSC/ondemand/pull/603)
+- Replace accidental hardcoded OSC XDMoD host [#604](https://github.com/OSC/ondemand/pull/604)
+
 ## [1.8.6] - 2020-07-20
 ### Added
 - Configuration for XDMoD auto-login timeout [#597](https://github.com/OSC/ondemand/pull/597)
@@ -486,7 +491,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - From 1.3.7 - 1.4.2 updated app versions
 
 
-[Unreleased]: https://github.com/OSC/ondemand/compare/v1.8.6...HEAD
+[Unreleased]: https://github.com/OSC/ondemand/compare/v1.8.7...HEAD
+[1.8.7]: https://github.com/OSC/ondemand/compare/v1.8.6...v1.8.7
 [1.8.6]: https://github.com/OSC/ondemand/compare/v1.8.5...v1.8.6
 [1.8.5]: https://github.com/OSC/ondemand/compare/v1.8.4...v1.8.5
 [1.8.4]: https://github.com/OSC/ondemand/compare/v1.8.3...v1.8.4