diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index 54fdd2b..701b8c6 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,2 +1,2 @@
-DIST postgresql-16.5.tar.bz2 24854528 BLAKE2B c1a7fb0f46889358bf700ef0ba3e776032433388933293f6582ad9777c30e0912810ad7eefa9fa31068d974156bc623b746061cf9ce9216bee0158a84c9f3a0f SHA512 aec47744284c5a593f4223de26187dd4b00e27a8a8948c6b7d24ca522eb6b4d0098ec956e80f37d5a3a841d18e45e4a21e7323e33af91eff24e1b2c59577bef1
-DIST postgresql-17.1.tar.bz2 21410991 BLAKE2B 324e64ed2243c70ba6046b4f495cb510943b63b2c5efb52fabc7a3f4101285ad068057a561a5bb64ded7be69bfc10e1d4df7d66d1a589132d14424974ab82f94 SHA512 41bd56ea5d2c3d41bd273894a056bd10244b33186746b63918f03671ba548551e02694f8215f09c6408c4dd6bb6ba0e87dec612560e8a267f5c5734b177e70a0
+DIST postgresql-16.6.tar.bz2 24856956 BLAKE2B 2d6d6efcc4cb0027c03422c839856ac024d3824a7e7da42cafbb961616cdd078064e78b6eb1c98565240ab1f78eb52582f38c9ce80b3a98f9e65568b2c14e40c SHA512 ffd6d39fb7aed87241237d68af4934fba1b4ac1be4d3c2833e308e50c21a693796fe54b73e0905365d7557009c40049a23b966aa86765b969797434a0d4bd5f8
+DIST postgresql-17.2.tar.bz2 21408880 BLAKE2B 1afafbec5db26ab17f2410c40db38e30fc1413cd518d387bc01640232698407de97123d0c61e1ec4d32d1041055db874f04dd52ad3697f1b9993b1aff3c5156a SHA512 8e15e47c22d21e1cadc31249cf31af5abe34b8ab72930e58e5fe6124795ad237ca7b4fd3bf36b5f18589c4fc439dc2bab3045d9b4ba23d1846b4b2be6fd1cb69
diff --git a/dev-db/postgresql/postgresql-16.5.ebuild b/dev-db/postgresql/postgresql-16.6.ebuild
similarity index 100%
rename from dev-db/postgresql/postgresql-16.5.ebuild
rename to dev-db/postgresql/postgresql-16.6.ebuild
diff --git a/dev-db/postgresql/postgresql-17.1.ebuild b/dev-db/postgresql/postgresql-17.2.ebuild
similarity index 98%
rename from dev-db/postgresql/postgresql-17.1.ebuild
rename to dev-db/postgresql/postgresql-17.2.ebuild
index d2a1c46..207b1d8 100644
--- a/dev-db/postgresql/postgresql-17.1.ebuild
+++ b/dev-db/postgresql/postgresql-17.2.ebuild
@@ -128,6 +128,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Fails to build with C23, fallback to the old default in < GCC 15
+	# for now: https://marc.info/?l=pgsql-bugs&m=173185132906874&w=2
+	append-cflags -std=gnu17
+
 	case ${CHOST} in
 		*-darwin*|*-solaris*)
 			use nls && append-libs intl
diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index b6efc09..82ecf3f 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -143,6 +143,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# Fails to build with C23, fallback to the old default in < GCC 15
+	# for now: https://marc.info/?l=pgsql-bugs&m=173185132906874&w=2
+	append-cflags -std=gnu17
+
 	case ${CHOST} in
 		*-darwin*|*-solaris*)
 			use nls && append-libs intl