diff --git a/mingw-w64-postgresql/PKGBUILD b/mingw-w64-postgresql/PKGBUILD
index 34ad60a3d2..737a6b3819 100644
--- a/mingw-w64-postgresql/PKGBUILD
+++ b/mingw-w64-postgresql/PKGBUILD
@@ -4,7 +4,7 @@ _realname=postgresql
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=17.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -40,12 +40,10 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-libxslt: XML plugin"
             "${MINGW_PACKAGE_PREFIX}-tcl: for PL/Tcl support")
 source=("https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2"
         postgresql-13.1-disable-wsa-invalid-event-static-assert.patch
-        postgresql-14.0-use-mingw-setjmp-on-ucrt.patch
-        postgresql-17.0-fix-build-on-mingw64.patch)
+        postgresql-14.0-use-mingw-setjmp-on-ucrt.patch)
 sha256sums=('7e276131c0fdd6b62588dbad9b3bb24b8c3498d5009328dba59af16e819109de'
             '72c14a78eeafdd3c9a13c3e124b1941b5da090488c7bd73f08b3cd78bacd07d5'
-            'fe336eac7892b23988189be0178efc95449d8d08493db83754058f5f37bb8ea9'
-            '949406ec785dc4c062e9b94c49927060595b63d72fe35c7e86f2b67b3e91044d')
+            'fe336eac7892b23988189be0178efc95449d8d08493db83754058f5f37bb8ea9')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -61,8 +59,7 @@ prepare() {
 
   apply_patch_with_msg \
     postgresql-13.1-disable-wsa-invalid-event-static-assert.patch \
-    postgresql-14.0-use-mingw-setjmp-on-ucrt.patch \
-    postgresql-17.0-fix-build-on-mingw64.patch
+    postgresql-14.0-use-mingw-setjmp-on-ucrt.patch
 }
 
 build() {
diff --git a/mingw-w64-postgresql/postgresql-17.0-fix-build-on-mingw64.patch b/mingw-w64-postgresql/postgresql-17.0-fix-build-on-mingw64.patch
deleted file mode 100644
index ea5d0799fc..0000000000
--- a/mingw-w64-postgresql/postgresql-17.0-fix-build-on-mingw64.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/src/backend/regex/regc_pg_locale.c
-+++ b/src/backend/regex/regc_pg_locale.c
-@@ -308,8 +308,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isdigit((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswdigit_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -342,8 +344,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isalpha((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswalpha_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -376,8 +380,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isalnum((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswalnum_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -419,8 +425,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isupper((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswupper_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -453,8 +461,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					islower((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswlower_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -487,8 +497,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isgraph((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswgraph_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -521,8 +533,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isprint((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswprint_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -555,8 +569,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					ispunct((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswpunct_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -589,8 +605,10 @@
- 			return (c <= (pg_wchar) UCHAR_MAX &&
- 					isspace((unsigned char) c));
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return iswspace_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			return (c <= (pg_wchar) UCHAR_MAX &&
-@@ -631,8 +649,10 @@
- 				return toupper((unsigned char) c);
- 			return c;
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return towupper_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			if (c <= (pg_wchar) UCHAR_MAX)
-@@ -673,8 +693,10 @@
- 				return tolower((unsigned char) c);
- 			return c;
- 		case PG_REGEX_LOCALE_WIDE_L:
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
- 				return towlower_l((wint_t) c, pg_regex_locale->info.lt);
-+#endif
- 			/* FALL THRU */
- 		case PG_REGEX_LOCALE_1BYTE_L:
- 			if (c <= (pg_wchar) UCHAR_MAX)
---- a/src/backend/utils/adt/formatting.c
-+++ b/src/backend/utils/adt/formatting.c
-@@ -1731,9 +1731,11 @@
- 
- 				for (curr_char = 0; workspace[curr_char] != 0; curr_char++)
- 				{
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 					if (mylocale)
- 						workspace[curr_char] = towlower_l(workspace[curr_char], mylocale->info.lt);
- 					else
-+#endif
- 						workspace[curr_char] = towlower(workspace[curr_char]);
- 				}
- 
-@@ -1879,9 +1881,11 @@
- 
- 				for (curr_char = 0; workspace[curr_char] != 0; curr_char++)
- 				{
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 					if (mylocale)
- 						workspace[curr_char] = towupper_l(workspace[curr_char], mylocale->info.lt);
- 					else
-+#endif
- 						workspace[curr_char] = towupper(workspace[curr_char]);
- 				}
- 
-@@ -2081,6 +2085,7 @@
- 
- 				for (curr_char = 0; workspace[curr_char] != 0; curr_char++)
- 				{
-+#if !defined(__MSVCRT_VERSION__) || (defined(__MSVCRT_VERSION__) && __MSVCRT_VERSION__ >= 0x800)
- 					if (mylocale)
- 					{
- 						if (wasalnum)
-@@ -2090,6 +2095,7 @@
- 						wasalnum = iswalnum_l(workspace[curr_char], mylocale->info.lt);
- 					}
- 					else
-+#endif
- 					{
- 						if (wasalnum)
- 							workspace[curr_char] = towlower(workspace[curr_char]);