diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c1735b2ef..0e0116f66e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,13 +9,32 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Added
 
 ### Fixed
-- Fix "Avoid leaking server error details through BatchUpdateException when logServerErrorDetail=false" [PR #2148](https://github.com/pgjdbc/pgjdbc/pull/2148) fixes Issue #2147
 
-[42.2.23] (2021-07-06 09:17:32 -0400)
 
+## [42.2.24] (2021-09-23)
+### Fixed
+- Fix startup regressions caused by [PR #1949](https://github.com/pgjdbc/pgjdbc/pull/1949). Instead of checking all types by OID, we can return types for well known types [PR #2257](https://github.com/pgjdbc/pgjdbc/pull/2257)
+- Backport [PR #2148](https://github.com/pgjdbc/pgjdbc/pull/2148)
+  Avoid leaking server error details through BatchUpdateException when logServerErrorDetail [PR #2254](https://github.com/pgjdbc/pgjdbc/pull/2254)
+- Backpatch [PR #2247](https://github.com/pgjdbc/pgjdbc/pull/2247)
+  QueryExecutorImpl.receiveFastpathResult did not properly handle ParameterStatus messages.
+  This in turn caused failures for some LargeObjectManager operations. Closes [Issue #2237](https://github.com/pgjdbc/pgjdbc/issues/2237)
+  Fixed by adding the missing code path, based on the existing handling in processResults. [PR #2253](https://github.com/pgjdbc/pgjdbc/pull/2253)
+- Backpatch [PR #2242](https://github.com/pgjdbc/pgjdbc/pull/2242) PgDatabaseMetaData.getIndexInfo() cast operands to smallint  [PR#2253](https://github.com/pgjdbc/pgjdbc/pull/2253) 
+  It is possible to break method PgDatabaseMetaData.getIndexInfo() by adding certain custom operators. This PR fixes it.
+- Backpatching [PR #2251](https://github.com/pgjdbc/pgjdbc/pull/2251) into 42.2 Clean up open connections to fix test failures on omni and appveyor
+  use older syntax for COMMENT ON FUNCTION with explicit no-arg parameter parentheses as it is required on server versions before v10.
+  Handle cleanup of connection creation in StatementTest, handle cleanup of privileged connection in DatabaseMetaDataTest
+- Backpatch [PR #2245](https://github.com/pgjdbc/pgjdbc/pull/2245) fixes case where duplicate tables are returned if there are duplicate descriptions oids are not guaranteed to be unique in the catalog [PR #2248](https://github.com/pgjdbc/pgjdbc/pull/2248)
+- Change to updatable result set to use correctly primary or unique keys [PR #2228](https://github.com/pgjdbc/pgjdbc/pull/2228) 
+    fixes issues introduced in [PR #2199](https://github.com/pgjdbc/pgjdbc/pull/2199) closes [Issue #2196](https://github.com/pgjdbc/pgjdbc/issues/2196)
+- Fix NPE calling getTypeInfo when alias is null [PR #2220](https://github.com/pgjdbc/pgjdbc/pull/2220)
+- Backpatch [PR #2217](https://github.com/pgjdbc/pgjdbc/pull/2217) to fix [Issue #2215](https://github.com/pgjdbc/pgjdbc/issues/2215). OIDs are unsigned integers and were not being handled correctly when they exceeded the size of signed integers
+
+
+## [42.2.23] (2021-07-06)
 ### Changed
 - renewed the SSL keys for testing 
-### Added
 
 ### Fixed
 - getColumnPrecision for Numeric when scale and precision not specified now returns 0 instead of 131089 fixes: Issue #2188
@@ -24,22 +43,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Rework sql type gathering to use OID instead of typname. 
   This does not have the issue of name shadowing / qual-names, and has the added benefit of fixing #1948.
 
-[42.2.22] (2021-06-16 10:09:33 -0400)
-### Changed
-
-### Added
 
+## [42.2.22] (2021-06-16)
 ### Fixed
 - Regression caused by https://github.com/pgjdbc/pgjdbc/commit/4fa2d5bc1ed8c0086a3a197fc1c28f7173d53cac. Unfortunately
   due to the blocking nature of the driver and issues with seeing if there is a byte available on a blocking stream when it is encrypted
   this introduces unacceptable delays in returning from peek(). At this time there is no simple solution to this.
-  
-[42.2.21] (2021-06-10 10:08:21 -0400)
+
+
+## [42.2.21] (2021-06-10)
 ### Changed
 - update docs to reflect deprecated DataSource API setServerName backpatch [PR#2057](https://github.com/pgjdbc/pgjdbc/pull/2057) [PR #2105](https://github.com/pgjdbc/pgjdbc/pull/2105)
 
-### Added
-
 ### Fixed
 - make sure the table has defined primary keys when using updateable resultset backpatch [PR#2101](https://github.com/pgjdbc/pgjdbc/pull/2101) fixes [Issue 1975](https://github.com/pgjdbc/pgjdbc/issues/1975) [PR #2106](https://github.com/pgjdbc/pgjdbc/pull/2106)
 - backpatch [PR #2143](https://github.com/pgjdbc/pgjdbc/pull/2143) read notifies or errors that come in asynchronously after the ready for query [PR #2168](https://github.com/pgjdbc/pgjdbc/pull/2168)
@@ -47,12 +62,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Fix database metadata getFunctions() and getProcedures() to ignore search_path when no schema pattern is specified. backpatch [PR #2174](https://github.com/pgjdbc/pgjdbc/pull/2174)
   fixes [Issue 2173](https://github.com/pgjdbc/pgjdbc/issues/2173)
 
-[42.2.20] (2021-04-19 15:38:44 -0400)
-
-### Changed
-
-### Added
 
+## [42.2.20] (2021-04-19)
 ### Fixed
 - Partitioned indexes were not found fixes [#2078](https://github.com/pgjdbc/pgjdbc/issues/2078) PR [#2087](https://github.com/pgjdbc/pgjdbc/pull/2087)
 
@@ -61,8 +72,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
   The timeouts are blocking each other with this approach.
 - DatabaseMetaData.getTables returns columns in UPPER case as per the spec [PR #2092](https://github.com/pgjdbc/pgjdbc/pull/2092) fixes [Issue #830](https://github.com/pgjdbc/pgjdbc/issues/830)
 
-## [42.2.19] (2021-02-18)
 
+## [42.2.19] (2021-02-18)
 **Notable Changes**
 - Now the driver uses SASLprep normalization for SCRAM authentication fixing some issues with spaces in passwords.
 - If closeOnCompletion is called on an existing statement and the statement
@@ -89,12 +100,14 @@ is executed a second time it will fail.
 - Fix Resolve ParseError in PGtokenizer fixes #2050
 - Fix return metadata privileges for views and foreign tables
 
-## [42.2.18]
+
+## [42.2.18] (2020-10-15)
 ### Fixed
 - Unfortunately changing the default of gssEncMode to ALLOW was not enough. The GSSEncMode Enum was not changed as well
 fixed in #1920
 
-## [42.2.17]
+
+## [42.2.17] (2020-10-09)
 ### Changed
 - Change default of gssEncMode to ALLOW. PostgreSQL can deal with PREFER but there are cloud providers that did not implement the protocol properly. Libpq gets around this by checking for a GSS credential cache before attempting the connection. This is possible in JDK 8 and up, but not JDK6, or JDK7 fixes Issue #1868 [PR #1913](https://github.com/pgjdbc/pgjdbc/pull/1913)
 
@@ -107,6 +120,7 @@ fixed in #1920
 - PgTokenizer was ignoring last empty token [PR #1882](https://github.com/pgjdbc/pgjdbc/pull/1882)
 - Remove osgi from karaf fixes Issue #1891 [PR #1902](https://github.com/pgjdbc/pgjdbc/pull/1902)
 
+
 ## [42.2.16] (2020-08-20)
 ### Known issues
 - The driver returns enum and jsonb arrays elements are returned as PGobject instances (fixed in 42.2.17)
@@ -509,5 +523,6 @@ thrown to caller to be dealt with so no need to log at this verbosity by pgjdbc
 [42.2.21]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.20...REL42.2.21
 [42.2.22]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.21...REL42.2.22
 [42.2.23]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.22...REL42.2.23
-[Unreleased]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...HEAD
+[42.2.24]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.23...REL42.2.24
 
+[Unreleased]: https://github.com/pgjdbc/pgjdbc/compare/REL42.2.24...HEAD
diff --git a/contributors.json b/contributors.json
index e85d85b430..4a4f55acaf 100644
--- a/contributors.json
+++ b/contributors.json
@@ -33,6 +33,7 @@
    "Hari Babu Kommi" : "https://github.com/kommiharibabu",
    "Harry Chan" : "https://github.com/hc-codersatlas",
    "Hugh Cole-Baker" : "https://github.com/sigmaris",
+   "Hugo Abreu" : "6619758+hugomiguelabreu@users.noreply.github.com",
    "Igor Volkov" : "https://github.com/virtual-machinist",
    "ItaiFonio" : "https://github.com/ItaiFonio",
    "Ivan Leskin" : "https://github.com/leskin-in",
@@ -44,12 +45,14 @@
    "Jan Van den Bergh" : "https://github.com/janvdbergh",
    "Jean-Christophe Arnu" : "https://github.com/jcarnu",
    "Jeff Klukas" : "https://github.com/jklukas",
+   "Jens Peters" : "https://github.com/jp7677",
    "Jeremy Mailen" : "https://github.com/jeremymailen",
    "Jeremy Whiting" : "https://github.com/whitingjr",
    "Jesper Pedersen" : "https://github.com/jesperpedersen",
    "Joe Kutner" : "https://github.com/jkutner",
    "Jordan Lewis" : "https://github.com/jordanlewis",
    "Jorge Solórzano" : "https://github.com/jorsol",
+   "Juha Syrjälä" : "https://github.com/jsyrjala",
    "Kamal Kumlien" : "https://github.com/kkumlien",
    "Kazuhiro Sera" : "https://github.com/seratch",
    "Kevin Wooten" : "https://github.com/kdubb",
@@ -131,6 +134,7 @@
    "bjanczak" : "https://github.com/bjanczak",
    "bpd0018" : "https://github.com/bpd0018",
    "chalda" : "https://github.com/ochaloup",
+   "chalmagr" : "https://github.com/chalmagr",
    "crwr45" : "https://github.com/crwr45",
    "djydewang" : "https://github.com/djydewang",
    "draderaws" : "https://github.com/draderaws",
@@ -155,6 +159,5 @@
    "zapov" : "https://github.com/zapov",
    "Álvaro Hernández Tortosa" : "https://github.com/ahachete",
    "Árpád Magosányi" : "https://github.com/magwas",
-   "Étienne BERSAC" : "https://github.com/bersace",
-   "Hugo Abreu" : "6619758+hugomiguelabreu@users.noreply.github.com"
+   "Étienne BERSAC" : "https://github.com/bersace"
 }
diff --git a/docs/_posts/2021-09-22-42.2.24-release.md b/docs/_posts/2021-09-22-42.2.24-release.md
new file mode 100644
index 0000000000..e5f358dd48
--- /dev/null
+++ b/docs/_posts/2021-09-22-42.2.24-release.md
@@ -0,0 +1,70 @@
+---
+title: PostgreSQL JDBC Driver 42.2.24 Released
+date: 2021-09-22 15:30:49 +0000
+categories:
+  - new_release
+version: 42.2.24
+---
+
+### Fixed
+- Fix startup regressions caused by [PR #1949](https://github.com/pgjdbc/pgjdbc/pull/1949). Instead of checking all types by OID, we can return types for well known types [PR #2257](https://github.com/pgjdbc/pgjdbc/pull/2257)
+- Backport [PR #2148](https://github.com/pgjdbc/pgjdbc/pull/2148)
+  Avoid leaking server error details through BatchUpdateException when logServerErrorDetail [PR #2254](https://github.com/pgjdbc/pgjdbc/pull/2254)
+- Backpatch [PR #2247](https://github.com/pgjdbc/pgjdbc/pull/2247)
+  QueryExecutorImpl.receiveFastpathResult did not properly handle ParameterStatus messages.
+  This in turn caused failures for some LargeObjectManager operations. Closes [Issue #2237](https://github.com/pgjdbc/pgjdbc/issues/2237)
+  Fixed by adding the missing code path, based on the existing handling in processResults. [PR #2253](https://github.com/pgjdbc/pgjdbc/pull/2253)
+- Backpatch [PR #2242](https://github.com/pgjdbc/pgjdbc/pull/2242) PgDatabaseMetaData.getIndexInfo() cast operands to smallint  [PR#2253](https://github.com/pgjdbc/pgjdbc/pull/2253) 
+  It is possible to break method PgDatabaseMetaData.getIndexInfo() by adding certain custom operators. This PR fixes it.
+- Backpatching [PR #2251](https://github.com/pgjdbc/pgjdbc/pull/2251) into 42.2 Clean up open connections to fix test failures on omni and appveyor
+  use older syntax for COMMENT ON FUNCTION with explicit no-arg parameter parentheses as it is required on server versions before v10.
+  Handle cleanup of connection creation in StatementTest, handle cleanup of privileged connection in DatabaseMetaDataTest
+- Backpatch [PR #2245](https://github.com/pgjdbc/pgjdbc/pull/2245) fixes case where duplicate tables are returned if there are duplicate descriptions oids are not guaranteed to be unique in the catalog [PR #2248](https://github.com/pgjdbc/pgjdbc/pull/2248)
+- Change to updatable result set to use correctly primary or unique keys [PR #2228](https://github.com/pgjdbc/pgjdbc/pull/2228) 
+    fixes issues introduced in [PR #2199](https://github.com/pgjdbc/pgjdbc/pull/2199) closes [Issue #2196](https://github.com/pgjdbc/pgjdbc/issues/2196)
+- Fix NPE calling getTypeInfo when alias is null [PR #2220](https://github.com/pgjdbc/pgjdbc/pull/2220)
+- Backpatch [PR #2217](https://github.com/pgjdbc/pgjdbc/pull/2217) to fix [Issue #2215](https://github.com/pgjdbc/pgjdbc/issues/2215). OIDs are unsigned integers and were not being handled correctly when they exceeded the size of signed integers
+
+
+<!--more-->
+
+**Commits by author**
+
+Dave Cramer (7):
+
+* fix: backpatch PR[PR 2217](https://github.com/pgjdbc/pgjdbc/pull/2217) to fix issue #2215.  (#2218) [be1d4aa0](https://github.com/pgjdbc/pgjdbc/commit/be1d4aa05f818a1d64a58462413ac1291858a2b2)
+* fix: NPE calling getTypeInfo when alias is null [PR 2220](https://github.com/pgjdbc/pgjdbc/pull/2220) [77c7d94e](https://github.com/pgjdbc/pgjdbc/commit/77c7d94e05003db7bece1d7baeb059272e3bcda2)
+* remove old changelog information from post. Incorrectly added by development script that is clearly still in development [PR 2240](https://github.com/pgjdbc/pgjdbc/pull/2240) [a70834e8](https://github.com/pgjdbc/pgjdbc/commit/a70834e8c5c9c2c3ab7024c5c605d3a978c00272)
+* backpatch pr[PR 2245](https://github.com/pgjdbc/pgjdbc/pull/2245) fixes case where duplicate tables are returned if there are duplicate descriptions oids are not guaranteed to be unique in the catalog (#2248) [f4928cee](https://github.com/pgjdbc/pgjdbc/commit/f4928cee038543202e0f09a77348f249155fec12)
+* backpatch PR[PR 2247](https://github.com/pgjdbc/pgjdbc/pull/2247) (#2249) [7bf89c8b](https://github.com/pgjdbc/pgjdbc/commit/7bf89c8b2fa2218fc37f959753da2b01be09ffc2)
+* fix startup regressions caused by PR [PR 1949](https://github.com/pgjdbc/pgjdbc/pull/1949). Instead of checking all types by OID, we can return types for well known types (#2257) [88cfccab](https://github.com/pgjdbc/pgjdbc/commit/88cfccab1ce41c8fb9f238d2ff09eba969c41a02)
+* Bump version to 42.2.24 and update changelog [233c5181](https://github.com/pgjdbc/pgjdbc/commit/233c51810dc34d34ebb7efcd4d4b960d626b8c53)
+
+Jens Peters (1):
+
+* Backport PR2148 into 42.2.x [PR 2254](https://github.com/pgjdbc/pgjdbc/pull/2254) [2917c1f2](https://github.com/pgjdbc/pgjdbc/commit/2917c1f2d448f68419c89530ffc742a3d693ed1e)
+
+Juha Syrjälä (1):
+
+* PgDatabaseMetaData.getIndexInfo() cast operands to smallint [PR 2242](https://github.com/pgjdbc/pgjdbc/pull/2242) (#2253) [33af6a78](https://github.com/pgjdbc/pgjdbc/commit/33af6a780af0083b382d536c909a20145d5ff195)
+
+Sehrope Sarkuni (3):
+
+* test: Fix database metadata to handle older versions for function comment [bb1f7285](https://github.com/pgjdbc/pgjdbc/commit/bb1f7285b7884f3d8032a637b38f49f4b2faaac1)
+* test: Handle cleanup of connection creation in StatementTest [1c5f5271](https://github.com/pgjdbc/pgjdbc/commit/1c5f52712a5d6757b69effdb2c5d9eb06657a871)
+* test: Handle cleanup of privileged connection in DatabaseMetaDataTest [5c6041b4](https://github.com/pgjdbc/pgjdbc/commit/5c6041b49146cecee1e360a18789197827aa6adf)
+
+chalmagr (1):
+
+* Fix updateable result set when there are primary keys and unique keys [PR 2228](https://github.com/pgjdbc/pgjdbc/pull/2228) [c596587a](https://github.com/pgjdbc/pgjdbc/commit/c596587aa52db6573d5cf41f29f1f6b8afe29cb5)
+
+<a name="contributors_{{ page.version }}"></a>
+### Contributors to this release
+
+We thank the following people for their contributions to this release.
+
+[chalmagr](https://github.com/chalmagr)  
+[Dave Cramer](davec@postgresintl.com)  
+[Jens Peters](https://github.com/jp7677)  
+[Juha Syrjälä](https://github.com/jsyrjala)  
+[Sehrope Sarkuni](https://github.com/sehrope)  
diff --git a/gradle.properties b/gradle.properties
index 36e62bd2e4..8693d7d245 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@ kotlin.parallel.tasks.in.project=true
 # This is version for PgJdbc itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-pgjdbc.version=42.2.23
+pgjdbc.version=42.2.24
 
 # The options below configures the use of local clone (e.g. testing development versions)
 # You can pass un-comment it, or pass option -PlocalReleasePlugins, or -PlocalReleasePlugins=<path>