diff --git a/CHANGES.md b/CHANGES.md
index fb7cea39f..8592752b9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+## edge-19.8.5
+
+This edge release is a release candidate for `stable-2.5`.
+
+* CLI
+  * Fixed CLI filepath issue on Windows
+* Proxy
+  * Fixed gRPC client cancellations getting recorded as failures rather than
+    as successful
+
 ## edge-19.8.4
 
 This edge release is a release candidate for `stable-2.5`.
diff --git a/charts/linkerd2/Chart.yaml b/charts/linkerd2/Chart.yaml
index 96b06e861..8d1967ef3 100644
--- a/charts/linkerd2/Chart.yaml
+++ b/charts/linkerd2/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: "v1"
-appVersion: edge-19.8.4
+appVersion: edge-19.8.5
 description: Linkerd gives you observability, reliability, and security for your microservices — with no code change required.
 home: https://linkerd.io
 keywords:
diff --git a/charts/linkerd2/values.yaml b/charts/linkerd2/values.yaml
index e21ff4564..cd25cfd6b 100644
--- a/charts/linkerd2/values.yaml
+++ b/charts/linkerd2/values.yaml
@@ -7,7 +7,7 @@ EnableH2Upgrade: true
 ImagePullPolicy: &image_pull_policy IfNotPresent
 
 # control plane version. See Proxy section for proxy version
-LinkerdVersion: &linkerd_version edge-19.8.4
+LinkerdVersion: &linkerd_version edge-19.8.5
 
 Namespace: linkerd
 OmitWebhookSideEffects: false