diff --git a/.gitignore b/.gitignore
index 8415e4a..fa17014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 SOURCES/postgresql-9.6.5-US.pdf
 SOURCES/postgresql-9.6.5.tar.bz2
-SOURCES/postgresql-setup-5.1.tar.gz
+SOURCES/postgresql-setup-6.0.tar.gz
diff --git a/.rh-postgresql96-postgresql.metadata b/.rh-postgresql96-postgresql.metadata
index 8a09b5c..c3209fc 100644
--- a/.rh-postgresql96-postgresql.metadata
+++ b/.rh-postgresql96-postgresql.metadata
@@ -1,3 +1,3 @@
 acf3ad6eeb98f582a1b1e06404dd5fe370d8d37b SOURCES/postgresql-9.6.5-US.pdf
 e45faa85c03a937eb82a34a3f02a4793bba836a6 SOURCES/postgresql-9.6.5.tar.bz2
-4a4a4931d5dde7a88d16288194fef66eef03565a SOURCES/postgresql-setup-5.1.tar.gz
+8c2d7c97ba79dbb5dc804461a6acddbd1b7959e6 SOURCES/postgresql-setup-6.0.tar.gz
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index bfcdb6b..12f0b1c 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -68,7 +68,7 @@ Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 9.6
 Version: 9.6.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 @@ License: PostgreSQL
 Group: Applications/Databases
 Url: http://www.postgresql.org/
 
-%global setup_version 5.1
+%global setup_version 6.0
 
 %global service_name %{?scl_prefix}postgresql.service
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -1196,9 +1196,13 @@ make -C postgresql-setup-%{setup_version} check
 %{_mandir}/man1/pg_resetxlog.*
 %{_mandir}/man1/pg_rewind.*
 %{_mandir}/man1/postgres.*
+%if %systemd_build
+%{_mandir}/man1/postgresql-new-systemd-unit.*
+%endif
 %{_mandir}/man1/postgresql-setup.*
 %{_mandir}/man1/postmaster.*
 %if %systemd_build
+%{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/%{?scl_prefix}postgresql.conf
 %{_unitdir}/*%{?scl_prefix}postgresql*.service
 %else
@@ -1276,6 +1280,9 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 %changelog
+* Mon Nov 06 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.5-2
+- fix CVE-2017-15097 by rebasing postgresql-setup to the latest version
+
 * Fri Sep 22 2017 Petr Kubat <pkubat@redhat.com> - 9.6.5-1
 - the latest upstream minor release, per release notes:
   https://www.postgresql.org/docs/9.6/static/release-9-6-5.html