diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix
index ff441a8851da..0a72416bef29 100644
--- a/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/pkgs/servers/sql/postgresql/ext/age.nix
@@ -11,9 +11,10 @@
 
 let
   hashes = {
-    # Issue tracking PostgreSQL 17 support: https://github.com/apache/age/issues/2111
-    # "17" = "";
-    "16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw=";
+    # Issue tracking PostgreSQL 18 support: https://github.com/apache/age/issues/2164
+    # "18" = "";
+    "17" = "sha256-gqoAhVqQaDhe5CIcTc//1HonQLP1zoBIGuCQuXsJy+A=";
+    "16" = "sha256-iukdi2c3CukGvjuTojybFFAZBlAw8GEfzFPr2qJuwTA=";
     "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM=";
     "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E=";
     "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw=";
@@ -21,14 +22,12 @@ let
 in
 postgresqlBuildExtension (finalAttrs: {
   pname = "age";
-  version = "1.5.0-rc0";
+  version = if lib.versionAtLeast postgresql.version "16" then "1.6.0-rc0" else "1.5.0-rc0";
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "age";
-    tag = "PG${lib.versions.major postgresql.version}/v${
-      builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
-    }";
+    tag = "PG${lib.versions.major postgresql.version}/v${finalAttrs.version}";
     hash =
       hashes.${lib.versions.major postgresql.version}
       or (throw "Source for Age is not available for ${postgresql.version}");
@@ -76,7 +75,7 @@ postgresqlBuildExtension (finalAttrs: {
     broken = !builtins.elem (lib.versions.major postgresql.version) (builtins.attrNames hashes);
     description = "Graph database extension for PostgreSQL";
     homepage = "https://age.apache.org/";
-    changelog = "https://github.com/apache/age/raw/v${finalAttrs.src.rev}/RELEASE";
+    changelog = "https://github.com/apache/age/raw/PG${lib.versions.major postgresql.version}/v${finalAttrs.version}/RELEASE";
     maintainers = [ ];
     platforms = postgresql.meta.platforms;
     license = lib.licenses.asl20;