diff --git a/.gitignore b/.gitignore
index d08ebda..5132134 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-12.9.tar.bz2
 SOURCES/postgresql-13.5-US.pdf
 SOURCES/postgresql-13.5.tar.bz2
-SOURCES/postgresql-setup-8.5.tar.gz
+SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 3541072..ac12609 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.tar.bz2
 385045e9682000e631841889ba22898a6328d5ed SOURCES/postgresql-13.5-US.pdf
 9321e2b01d1ffb15adae06945cb2c5f9dd671bc9 SOURCES/postgresql-13.5.tar.bz2
-3f6ff4a7c424f15034b35380a8669b52d7fb3940 SOURCES/postgresql-setup-8.5.tar.gz
+9e12ee26bf41d3831f83049b51ae5da76de2ce12 SOURCES/postgresql-setup-8.6.tar.gz
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
old mode 100755
new mode 100644
index ebca177..6d21f06
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -60,7 +60,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
 Version: %{majorversion}.5
-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.5
+%global setup_version 8.6
 
 %global service_name postgresql.service
 
@@ -1225,9 +1225,16 @@ 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: #2024608
+- 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