diff --git a/.gitignore b/.gitignore
index e99cdbe..67ff669 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-12.9.tar.bz2
 SOURCES/postgresql-13.11-US.pdf
 SOURCES/postgresql-13.11.tar.bz2
-SOURCES/postgresql-setup-8.6.tar.gz
+SOURCES/postgresql-setup-8.7.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index f8050a5..3ad0930 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2
 c7cc63d5caffcc5d4d8f31e07845722dc6db7787 SOURCES/postgresql-13.11-US.pdf
 501acb24ba8539c08ba12b08adecd7559bf87e1b SOURCES/postgresql-13.11.tar.bz2
-9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
+fb97095dc9648f9c31d58fcb406831da5e419ddf SOURCES/postgresql-setup-8.7.tar.gz
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 01c3d02..5a758a4 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/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,9 +1225,13 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
-* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 13.11-1
+* Mon Dec 11 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 13.11-2
 - Rebuilt for MSVSphere 8.8
 
+* 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