diff --git a/.gitignore b/.gitignore
index 1bd8ee2..5132134 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-SOURCES/postgresql-12.7.tar.bz2
-SOURCES/postgresql-13.3-US.pdf
-SOURCES/postgresql-13.3.tar.bz2
-SOURCES/postgresql-setup-8.5.tar.gz
+SOURCES/postgresql-12.9.tar.bz2
+SOURCES/postgresql-13.5-US.pdf
+SOURCES/postgresql-13.5.tar.bz2
+SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 9b686c1..ac12609 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
-e7071caed1f31a0b6d7579ea66e00342e8ebe146 SOURCES/postgresql-12.7.tar.bz2
-0f1150c6be91f6fcfdd4d98b506da4f98c422534 SOURCES/postgresql-13.3-US.pdf
-7a775f95367613ed5f7e4cd632586f9628475a92 SOURCES/postgresql-13.3.tar.bz2
-3f6ff4a7c424f15034b35380a8669b52d7fb3940 SOURCES/postgresql-setup-8.5.tar.gz
+a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2
+385045e9682000e631841889ba22898a6328d5ed SOURCES/postgresql-13.5-US.pdf
+9321e2b01d1ffb15adae06945cb2c5f9dd671bc9 SOURCES/postgresql-13.5.tar.bz2
+9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/SOURCES/postgresql-12.7.tar.bz2.sha256 b/SOURCES/postgresql-12.7.tar.bz2.sha256
deleted file mode 100644
index 7bbec0d..0000000
--- a/SOURCES/postgresql-12.7.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995  postgresql-12.7.tar.bz2
diff --git a/SOURCES/postgresql-12.9.tar.bz2.sha256 b/SOURCES/postgresql-12.9.tar.bz2.sha256
new file mode 100644
index 0000000..5eae283
--- /dev/null
+++ b/SOURCES/postgresql-12.9.tar.bz2.sha256
@@ -0,0 +1 @@
+89fda2de33ed04a98548e43f3ee5f15b882be17505d631fe0dd1a540a2b56dce  postgresql-12.9.tar.bz2
diff --git a/SOURCES/postgresql-13.3.tar.bz2.sha256 b/SOURCES/postgresql-13.3.tar.bz2.sha256
deleted file mode 100644
index 7898d34..0000000
--- a/SOURCES/postgresql-13.3.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1  postgresql-13.3.tar.bz2
diff --git a/SOURCES/postgresql-13.5.tar.bz2.sha256 b/SOURCES/postgresql-13.5.tar.bz2.sha256
new file mode 100644
index 0000000..834e50e
--- /dev/null
+++ b/SOURCES/postgresql-13.5.tar.bz2.sha256
@@ -0,0 +1 @@
+9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3  postgresql-13.5.tar.bz2
diff --git a/SOURCES/postgresql.tmpfiles.d b/SOURCES/postgresql.tmpfiles.d
index d8d960d..6c48e34 100644
--- a/SOURCES/postgresql.tmpfiles.d
+++ b/SOURCES/postgresql.tmpfiles.d
@@ -1 +1 @@
-d /var/run/postgresql 0755 postgres postgres -
+d /run/postgresql 0755 postgres postgres -
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 2ad83f3..6d21f06 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -59,7 +59,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
-Version: %{majorversion}.3
+Version: %{majorversion}.5
 Release: 2%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -71,12 +71,12 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
-%global prevversion 12.7
+%global prevversion 12.9
 %global prevmajorversion 12
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
-%global setup_version 8.5
+%global setup_version 8.6
 
 %global service_name postgresql.service
 
@@ -1225,6 +1225,17 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon Nov 29 2021 Marek Kulik <mkulik@redhat.com> - 13.5-2
+- Update postgresql-setup to 8.6 (#2024567)
+
+* Mon Nov 15 2021 Filip Januš <fjanus@redhat.com> - 13.5-1
+- Update to 13.5
+- Resolves: #2007214
+
+* Mon Nov 08 2021 Filip Januš <fjansu@redhat.com> - 13.3-3
+- Correct path to tmpfiles
+  Resolves: #2016996
+
 * Wed Jul 14 2021 Filip Januš <fjanus@redhat.com> - 13.3-2
 - Enable ssl for upgrade server
   Resolves: #1982697