diff --git a/.gitignore b/.gitignore
index 4b733dc..ddde994 100755
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /postgresql-13.11.tar.bz2
 /postgresql-13.11.tar.bz2.sha256
 /postgresql-13.11-US.pdf
+/postgresql-setup-8.7.tar.gz
diff --git a/postgresql.spec b/postgresql.spec
index a05de9b..5952dba 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
 Version: %{majorversion}.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -76,7 +76,7 @@ Url: http://www.postgresql.org/
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
-%global setup_version 8.6
+%global setup_version 8.7
 
 %global service_name postgresql.service
 
@@ -1225,6 +1225,10 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Thu Jun 22 2023 Jorge San Emeterio <jsanemet@redhat.com> - 13.11-2
+- Update postgresql-setup to 8.7 (https://github.com/devexp-db/postgresql-setup/pull/35)
+- Resolves: #2207933
+
 * Tue Jun 13 2023 Jorge San Emeterio <jsanemet@redhat.com> - 13.11-1
 - Update to 13.11
 - Resolves: #2212815
diff --git a/sources b/sources
index 9e4ee89..840e8ff 100755
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-SHA512 (postgresql-13.11.tar.bz2) = 30c60de44f9a33470ea9cd0c9757de23341bf1f5b9f3e8ee2c5b303d6709d08e9aea0f6ae597e344f610a577809860c7921596fe63034b6c2e3fa488e3040987
-SHA512 (postgresql-13.11.tar.bz2.sha256) = 91330c6ada99e0aff7e5658574c56fb3de8e5642ac67c59f5a29ed5a6d829560f35a6cd3861e710d92ffa1589131a813ed5f949f1826978968be4c56c7711f21
-SHA512 (postgresql-13.11-US.pdf) = a085e7dedc6fbd37c69b6616d123f85d769cf20703a8b557f2d399fa1770bb98bb0bf0bdae4010e54da2da7da5e7f0bb5fa6928ee273da6bd8f1a0486feaa2fd
 SHA512 (postgresql-12.9.tar.bz2) = 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f
 SHA512 (postgresql-12.9.tar.bz2.sha256) = e06887f94a470d723c8d65ece5a32358da1881411ad92cc4ef35c9f6e8aa05a0485c729e07ab381cda4b53fe6fdaec1b07c2d0200ee8823ec45849e8a8f277f0
-SHA512 (postgresql-setup-8.6.tar.gz) = dc687670cd58070512833271d8f3e7e4308c47cba1ad4c93e3d5f61acf07f390ed048f4d7f1567d2826f19a253562e13e56407dcf81a42f42c61ac96d8fe3178
+SHA512 (postgresql-13.11.tar.bz2) = 30c60de44f9a33470ea9cd0c9757de23341bf1f5b9f3e8ee2c5b303d6709d08e9aea0f6ae597e344f610a577809860c7921596fe63034b6c2e3fa488e3040987
+SHA512 (postgresql-13.11.tar.bz2.sha256) = 91330c6ada99e0aff7e5658574c56fb3de8e5642ac67c59f5a29ed5a6d829560f35a6cd3861e710d92ffa1589131a813ed5f949f1826978968be4c56c7711f21
+SHA512 (postgresql-setup-8.7.tar.gz) = 741f036be517e7d9725e4f146ca7dac8b8a16b6a93d045a64ef268487f48faad6b08317b58e07ad16a31002d2a10de0ac32513a4935c3f22f48ec768a742d1fc
+SHA512 (postgresql-13.11-US.pdf) = a085e7dedc6fbd37c69b6616d123f85d769cf20703a8b557f2d399fa1770bb98bb0bf0bdae4010e54da2da7da5e7f0bb5fa6928ee273da6bd8f1a0486feaa2fd