diff --git a/.gitignore b/.gitignore
index b892e08..8c97011 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-9.6.20-US.pdf
-SOURCES/postgresql-9.6.20.tar.bz2
+SOURCES/postgresql-9.6.22-US.pdf
+SOURCES/postgresql-9.6.22.tar.bz2
 SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/.postgresql.metadata b/.postgresql.metadata
index df6d54d..bb16c14 100644
--- a/.postgresql.metadata
+++ b/.postgresql.metadata
@@ -1,3 +1,3 @@
-19d6cc6f8268e2135026d87dcffe202144829a96 SOURCES/postgresql-9.6.20-US.pdf
-13aa206da020a550e56dbf524ca227bc2191fa48 SOURCES/postgresql-9.6.20.tar.bz2
+42bc706baf296b04a3dc7d4aa66d4a9bb13a764d SOURCES/postgresql-9.6.22-US.pdf
+e56f90d8c25443d61c09226c011ae53eaff58bd8 SOURCES/postgresql-9.6.22.tar.bz2
 c1f5190ed00adbcca38ec6f57c1452222450bb0e SOURCES/postgresql-setup-8.2.tar.gz
diff --git a/SOURCES/postgresql-9.6.20-contrib-dblink-expected-out.patch b/SOURCES/postgresql-9.6.20-contrib-dblink-expected-out.patch
new file mode 100644
index 0000000..bd4b0e5
--- /dev/null
+++ b/SOURCES/postgresql-9.6.20-contrib-dblink-expected-out.patch
@@ -0,0 +1,13 @@
+diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
+index 6ceabb453c..6516d4f131 100644
+--- a/contrib/dblink/expected/dblink.out
++++ b/contrib/dblink/expected/dblink.out
+@@ -879,7 +879,7 @@ $d$;
+ CREATE USER MAPPING FOR public SERVER fdtest
+   OPTIONS (server 'localhost');  -- fail, can't specify server here
+ ERROR:  invalid option "server"
+-HINT:  Valid options in this context are: user, password
++HINT:  Valid options in this context are: user, password, sslpassword
+ CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
+ GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+ GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user;
diff --git a/SOURCES/postgresql-9.6.20.tar.bz2.sha256 b/SOURCES/postgresql-9.6.20.tar.bz2.sha256
deleted file mode 100644
index 6b42c74..0000000
--- a/SOURCES/postgresql-9.6.20.tar.bz2.sha256
+++ /dev/null
@@ -1 +0,0 @@
-3d08cba409d45ab62d42b24431a0d55e7537bcd1db2d979f5f2eefe34d487bb6  postgresql-9.6.20.tar.bz2
diff --git a/SOURCES/postgresql-9.6.22.tar.bz2.sha256 b/SOURCES/postgresql-9.6.22.tar.bz2.sha256
new file mode 100644
index 0000000..38c1db0
--- /dev/null
+++ b/SOURCES/postgresql-9.6.22.tar.bz2.sha256
@@ -0,0 +1 @@
+3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930  postgresql-9.6.22.tar.bz2
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 35f0925..5aed8b7 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -58,7 +58,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 9.6
-Version: %{majorversion}.20
+Version: %{majorversion}.22
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -105,7 +105,7 @@ Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
 Patch8: postgresql-no-libs.patch
 Patch9: postgresql-server-pg_config.patch
-# Patch10: postgresql-9.6.20-contrib-dblink-expected-out.patch
+Patch10: postgresql-9.6.20-contrib-dblink-expected-out.patch
 
 BuildRequires: gcc
 BuildRequires: perl(ExtUtils::MakeMaker) glibc-devel bison flex gawk
@@ -364,7 +364,7 @@ benchmarks.
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1
-# %%patch10 -p1
+%patch10 -p1
 
 # We used to run autoconf here, but there's no longer any real need to,
 # since Postgres ships with a reasonably modern configure script.
@@ -1169,11 +1169,16 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon May 31 2021 Filip Januš <fjanus@redhat.com> - 9.6.22-1
+- Rebase to 9.6.22
+  Resolves: #1964516
+  Fix: CVE-2021-32027, CVE-2021-32028
+
 * Thu Nov 19 2020 Patrik Novotný <panovotn@redhat.com> - 9.6.20-1
 - Rebase to upstream release 9.6.20
-  Resolves: rhbz#1901563
-  Resolves: rhbz#1898218
-  Resolves: rhbz#1898334
+  Resolves: rhbz#1898246
+  Resolves: rhbz#1898219
+  Resolves: rhbz#1898335
 
 * Mon Aug 24 2020 Honza Horak <hhorak@redhat.com> - 9.6.19-1
 - Rebase to 9.6.19