diff --git a/Docs/landing/data/releases.toml b/Docs/landing/data/releases.toml
index 942a8b0f94a..be04efff8e9 100644
--- a/Docs/landing/data/releases.toml
+++ b/Docs/landing/data/releases.toml
@@ -1,8 +1,13 @@
-current = "2.16.1"
+current = "2.17.0"
 
 [[versions]]
-  version = "2.16.1"
+  version = "2.17.0"
   status = "current"
+  docs = "./2.17/"
+  api = "./2.17/apidocs"
+
+[[versions]]
+  version = "2.16.1"
   docs = "./2.16/"
   api = "./2.16/apidocs"
 
diff --git a/Docs/landing/static/versions.json b/Docs/landing/static/versions.json
index fd1c168d01b..994c7c0fdfd 100644
--- a/Docs/landing/static/versions.json
+++ b/Docs/landing/static/versions.json
@@ -1,4 +1,5 @@
 [
+    {"version": "2.17"},
     {"version": "2.16"},
     {"version": "2.15"},
     {"version": "2.14"},
diff --git a/Docs/reference/config.toml b/Docs/reference/config.toml
index d60dc2937df..cdd54d2e522 100644
--- a/Docs/reference/config.toml
+++ b/Docs/reference/config.toml
@@ -1,4 +1,4 @@
-baseurl = "/mongo-csharp-driver/2.16"
+baseurl = "/mongo-csharp-driver/2.17"
 languageCode = "en-us"
 title = "MongoDB .NET Driver"
 theme = "mongodb"
diff --git a/Docs/reference/content/index.md b/Docs/reference/content/index.md
index 95c7326a77d..bfd81d6cfa6 100644
--- a/Docs/reference/content/index.md
+++ b/Docs/reference/content/index.md
@@ -9,7 +9,7 @@ type = "index"
 
 The [Getting Started]({{< relref "getting_started\index.md" >}}) guide contains information about system requirements, installation, and a simple tutorial to get up and running quickly.
 
-## What's new in 2.16.0
+## What's new in 2.17.0
 
 The [What's New]({{< relref "what_is_new.md" >}}) section contains the major new features of the driver.
 
diff --git a/Docs/reference/content/upgrading.md b/Docs/reference/content/upgrading.md
index ab42b535f54..a4d213f480f 100644
--- a/Docs/reference/content/upgrading.md
+++ b/Docs/reference/content/upgrading.md
@@ -11,9 +11,18 @@ title = "Upgrading"
 
 ## Breaking Changes
 
-### Backwards compatibility with driver version 2.7.0–2.15.x
+### Backwards compatibility with driver version 2.7.0–2.16.x
 
-Starting from 2.15.0, feature detection is implemented through maxWireVersion 
+Driver versions 2.13.0 to 2.15.X changed `EstimatedDocumentCount` to use
+the `$collStats` aggregation stage instead of the `count` command. This
+unintentionally broke estimated document counts on views. 2.16.0 and later
+switched back to using the `count` command. Unfortunately MongoDB 5.0.0-5.0.8
+do not include the `count` command in Stable API v1. If you are using the
+Stable API with `EstimatedDocumentCount`, you must upgrade to server version
+5.0.9+ or set `strict: false` when configuring `ServerApi` to avoid encountering
+errors.
+
+Starting from 2.15.0, feature detection is implemented through maxWireVersion
 instead of buildInfo. This should have no user-visible impact.
 
 Driver version 2.14.0 and later only supports MongoDB 3.6+. It cannot connect to
diff --git a/Docs/reference/content/what_is_new.md b/Docs/reference/content/what_is_new.md
index 3a6f83e02d8..3bd4f87ec02 100644
--- a/Docs/reference/content/what_is_new.md
+++ b/Docs/reference/content/what_is_new.md
@@ -8,6 +8,16 @@ title = "What's New"
   pre = "<i class='fa fa-star'></i>"
 +++
 
+## What's New in 2.17.0
+
+The main new features in 2.17.0 include:
+
+* Support for MongoDB server version 6.0.0 GA
+* [BETA] Support for Queryable Encryption
+* LINQ3 bug fixes and improvements
+* Add arbitrary aggregation stages to LINQ queries using `IMongoQueryable.AppendStage()` method (LINQ3)
+* Support for `$topN` and related accumulators in `$group` aggregation stage
+
 ## What's New in 2.16.0
 
 The main new features in 2.16.0 include:
diff --git a/Docs/reference/data/mongodb.toml b/Docs/reference/data/mongodb.toml
index cc9c5f8033f..294417bd4a5 100644
--- a/Docs/reference/data/mongodb.toml
+++ b/Docs/reference/data/mongodb.toml
@@ -1,5 +1,5 @@
 githubRepo = "mongo-csharp-driver"
 githubBranch = "master"
-currentVersion = "2.16"
+currentVersion = "2.17"
 highlightTheme = "idea.css"
 apiUrl = "apidocs/html"