diff --git a/README.md b/README.md
index 2020148e41..b30b77980c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 
 `pgrx` is a framework for developing PostgreSQL extensions in Rust and strives to be as idiomatic and safe as possible.
 
-`pgrx` supports Postgres 12 through Postgres 16.
+`pgrx` supports Postgres 12 through Postgres 17.
 
 **Feel free to join our [Discord Server](https://discord.gg/PMrpdJsqcJ).**
 
diff --git a/cargo-pgrx/README.md b/cargo-pgrx/README.md
index 55636bb93e..8ac7adf91f 100644
--- a/cargo-pgrx/README.md
+++ b/cargo-pgrx/README.md
@@ -336,7 +336,7 @@ Compile/install extension to a pgrx-managed Postgres instance and start psql
 Usage: cargo pgrx run [OPTIONS] [PG_VERSION] [DBNAME]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, or pg16? [env: PG_VERSION=]
+  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, pg16, or pg17? [env: PG_VERSION=]
   [DBNAME]      The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name
 
 Options:
@@ -386,7 +386,7 @@ Connect, via psql, to a Postgres instance
 Usage: cargo pgrx connect [OPTIONS] [PG_VERSION] [DBNAME]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, or pg16? [env: PG_VERSION=]
+  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, pg16, or pg17 [env: PG_VERSION=]
   [DBNAME]      The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name [env: DBNAME=]
 
 Options:
@@ -504,7 +504,7 @@ Run the test suite for this crate
 Usage: cargo pgrx test [OPTIONS] [PG_VERSION] [TESTNAME]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, pg16, or all? [env: PG_VERSION=]
+  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, pg16, pg17 or all? [env: PG_VERSION=]
   [TESTNAME]    If specified, only run tests containing this string in their names
 
 Options:
@@ -591,7 +591,7 @@ Generate extension schema files
 Usage: cargo pgrx schema [OPTIONS] [PG_VERSION]
 
 Arguments:
-  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, or pg16?
+  [PG_VERSION]  Do you want to run against pg12, pg13, pg14, pg15, pg16, or pg17?
 
 Options:
   -p, --package <PACKAGE>              Package to build (see `cargo help pkgid`)
diff --git a/cargo-pgrx/src/command/connect.rs b/cargo-pgrx/src/command/connect.rs
index 8591dfaf14..51506c7f4f 100644
--- a/cargo-pgrx/src/command/connect.rs
+++ b/cargo-pgrx/src/command/connect.rs
@@ -22,7 +22,7 @@ use std::path::PathBuf;
 #[derive(clap::Args, Debug)]
 #[clap(author)]
 pub(crate) struct Connect {
-    /// Do you want to run against pg12, pg13, pg14, pg15, or pg16?
+    /// Do you want to run against pg12, pg13, pg14, pg15, pg16, or pg17?
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     /// The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name
diff --git a/cargo-pgrx/src/command/run.rs b/cargo-pgrx/src/command/run.rs
index f714fc9e33..1eda6bc329 100644
--- a/cargo-pgrx/src/command/run.rs
+++ b/cargo-pgrx/src/command/run.rs
@@ -24,7 +24,7 @@ use std::process::Command;
 #[derive(clap::Args, Debug)]
 #[clap(author)]
 pub(crate) struct Run {
-    /// Do you want to run against pg12, pg13, pg14, pg15, or pg16?
+    /// Do you want to run against pg12, pg13, pg14, pg15, pg16, or pg17?
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     /// The database to connect to (and create if the first time).  Defaults to a database with the same name as the current extension name
diff --git a/cargo-pgrx/src/command/schema.rs b/cargo-pgrx/src/command/schema.rs
index 6f232f8896..e6a4d93c4a 100644
--- a/cargo-pgrx/src/command/schema.rs
+++ b/cargo-pgrx/src/command/schema.rs
@@ -33,7 +33,7 @@ pub(crate) struct Schema {
     /// Build in test mode (for `cargo pgrx test`)
     #[clap(long)]
     test: bool,
-    /// Do you want to run against pg12, pg13, pg14, pg15, or pg16?
+    /// Do you want to run against pg12, pg13, pg14, pg15, pg16, or pg17?
     pg_version: Option<String>,
     /// Compile for release mode (default is debug)
     #[clap(long, short)]
diff --git a/cargo-pgrx/src/command/start.rs b/cargo-pgrx/src/command/start.rs
index 7c06dc1a71..d96f0e99be 100644
--- a/cargo-pgrx/src/command/start.rs
+++ b/cargo-pgrx/src/command/start.rs
@@ -21,7 +21,7 @@ use std::process::Stdio;
 #[derive(clap::Args, Debug, Clone)]
 #[clap(author)]
 pub(crate) struct Start {
-    /// The Postgres version to stop (pg12, pg13, pg14, pg15, pg16, or all)
+    /// The Postgres version to stop (pg12, pg13, pg14, pg15, pg16, pg17, or all)
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     #[clap(from_global, action = ArgAction::Count)]
diff --git a/cargo-pgrx/src/command/stop.rs b/cargo-pgrx/src/command/stop.rs
index 3a30383217..24aea9e735 100644
--- a/cargo-pgrx/src/command/stop.rs
+++ b/cargo-pgrx/src/command/stop.rs
@@ -20,7 +20,7 @@ use std::process::Stdio;
 #[derive(clap::Args, Debug, Clone)]
 #[clap(author)]
 pub(crate) struct Stop {
-    /// The Postgres version to stop (pg12, pg13, pg14, pg15, pg16, or all)
+    /// The Postgres version to stop (pg12, pg13, pg14, pg15, pg16, pg17, or all)
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     #[clap(from_global, action = ArgAction::Count)]
diff --git a/cargo-pgrx/src/command/test.rs b/cargo-pgrx/src/command/test.rs
index 6fb21e4222..df935e7c9a 100644
--- a/cargo-pgrx/src/command/test.rs
+++ b/cargo-pgrx/src/command/test.rs
@@ -20,7 +20,7 @@ use crate::CommandExecute;
 #[derive(clap::Args, Debug, Clone)]
 #[clap(author)]
 pub(crate) struct Test {
-    /// Do you want to run against pg12, pg13, pg14, pg15, pg16, or all?
+    /// Do you want to run against pg12, pg13, pg14, pg15, pg16, pg17, or all?
     #[clap(env = "PG_VERSION")]
     pg_version: Option<String>,
     /// If specified, only run tests containing this string in their names