diff --git a/.gitignore b/.gitignore
index a65c0e0..08c0672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/postgresql-10.17.tar.bz2
-SOURCES/postgresql-12.7-US.pdf
-SOURCES/postgresql-12.7.tar.bz2
-SOURCES/postgresql-setup-8.4.tar.gz
+SOURCES/postgresql-12.9-US.pdf
+SOURCES/postgresql-12.9.tar.bz2
+SOURCES/postgresql-setup-8.6.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index 218d4cd..0a7e7a0 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,4 +1,4 @@
 479ec3bf2882a3188dd16ec92169c67e78995400 SOURCES/postgresql-10.17.tar.bz2
-704751c856874dd4f845b536fcefeacb25c96607 SOURCES/postgresql-12.7-US.pdf
-e7071caed1f31a0b6d7579ea66e00342e8ebe146 SOURCES/postgresql-12.7.tar.bz2
-f2112500abf4365fe968f1a7983fe174cca9e6f9 SOURCES/postgresql-setup-8.4.tar.gz
+5d4ff6d35b993626da2d4b98ea4224a9d6a8894a SOURCES/postgresql-12.9-US.pdf
+a79d8428850da50a65451e5e44771844c7f166d5 SOURCES/postgresql-12.9.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.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 c5275c6..f0a1862 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -59,8 +59,8 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 12
-Version: %{majorversion}.7
-Release: 2%{?dist}
+Version: %{majorversion}.9
+Release: 3%{?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.4
+%global setup_version 8.6
 
 %global service_name postgresql.service
 
@@ -1088,6 +1088,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_bindir}/pg_checksums
 %{_bindir}/postgres
 %{_bindir}/postgresql-setup
+%{_bindir}/postgresql-upgrade
 %{_bindir}/postmaster
 %dir %{_datadir}/pgsql
 %{_datadir}/pgsql/*.sample
@@ -1130,6 +1131,7 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/postgres.*
 %{_mandir}/man1/postgresql-new-systemd-unit.*
 %{_mandir}/man1/postgresql-setup.*
+%{_mandir}/man1/postgresql-upgrade.*
 %{_mandir}/man1/postmaster.*
 %{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/postgresql.conf
@@ -1223,6 +1225,21 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Tue Nov 30 2021 Filip Januš <fjanus@redhat.com> - 12.9-3
+- Add missing files from postgresql-setup v8.6
+- Realted: #1935301
+
+* Mon Nov 29 2021 Marek Kulik <mkulik@redhat.com> - 12.9-2
+- Update postgresql-setup to 8.6 (#1935301)
+
+* Mon Nov 15 2021 Filip Januš <fjanus@redhat.com> - 12.9-1
+- Update to 12.9
+- Resolves: #2007213
+
+* Fri Nov 05 2021 Filip Januš <fjanus@redhat.com> - 12.7-3
+- Using correct path to tmpfiles
+- Resolves: #2016991
+
 * Wed Jul 14 2021 Filip Januš <fjanus@redhat.com> - 12.7-2
 - Enable ssl for upgrade server
   Resolves: #1981518