diff --git a/.gitignore b/.gitignore
index 6912c65..57d55cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 /postgresql-9.5.9.tar.bz2.sha256
 /postgresql-9.6.5.tar.bz2
 /postgresql-9.6.5.tar.bz2.sha256
-/postgresql-setup-5.0.tar.gz
+/postgresql-setup-6.0.tar.gz
 /postgresql-9.6.5-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 493c397..18bc589 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -67,7 +67,7 @@ Summary: PostgreSQL client programs
 Name: 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.
@@ -85,7 +85,7 @@ Url: http://www.postgresql.org/
 %global prevversion 9.5.9
 %global prevmajorversion 9.5
 
-%global setup_version 5.0
+%global setup_version 6.0
 
 Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 # The PDF file is generated by generate-pdf.sh, which see for comments
@@ -1124,8 +1124,10 @@ fi
 %{_mandir}/man1/pg_resetxlog.*
 %{_mandir}/man1/pg_rewind.*
 %{_mandir}/man1/postgres.*
+%{_mandir}/man1/postgresql-new-systemd-unit.*
 %{_mandir}/man1/postgresql-setup.*
 %{_mandir}/man1/postmaster.*
+%{_sbindir}/postgresql-new-systemd-unit
 %{_tmpfilesdir}/postgresql.conf
 %{_unitdir}/postgresql.service
 %{_unitdir}/postgresql@.service
@@ -1197,6 +1199,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 08 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.5-2
+- rebase to new postgresql-setup 6.0 version, to fix CVE-2017-15097
+
 * Tue Aug 29 2017 Pavel Raiskup <praiskup@redhat.com> - 9.6.5-1
 - update to 9.6.5 per release notes:
   https://www.postgresql.org/docs/9.6/static/release-9-6-5.html
diff --git a/sources b/sources
index dff1895..5281e59 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-9.5.9.tar.bz2) = 2c6a887b80a4b1d1da18282f443419db2279d8fe6182
 SHA512 (postgresql-9.5.9.tar.bz2.sha256) = 2e41c8a4e4a702c621cde35adc9b3496a67190597673e3c725f4c03313dce22691896aae13813039dfbe46d9e131216bcd657210823a55840ddad110fc0d8cc7
 SHA512 (postgresql-9.6.5.tar.bz2) = ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9
 SHA512 (postgresql-9.6.5.tar.bz2.sha256) = 8cfe5bfb00689ae30b6a3ddbccb8c74c0be244e2317ffa33dc89e56838d8b06a81a59cef0a204fff4f8ef23f7cffd7579b96b2d9207a5efb069e2160c2381a05
-SHA512 (postgresql-setup-5.0.tar.gz) = 0cda4242c3fd856d120e4533e34358252ed1d9dbced1435c4997fbfa600e5132462ca6cc2782ed3959a09374317424463196c24ebe5b1e10e7ac80e09b6ebfbf
+SHA512 (postgresql-setup-6.0.tar.gz) = 4fa02b35d3b2d1d79193fd3a6af02532b5a6736dbae23cad485492acd4eb0c5f25159f36eb445a63eac0097ec4c52f57c58b0960fa012577c24daac5a032b243
 SHA512 (postgresql-9.6.5-US.pdf) = 1f9243275239d99a593690a0a04b3b61c36394993e6e9d55b585750e89e4e80391aa9fdeff8d7a5bbc93c0c8bca5989a46e382f531bbc2905866c093afedf6b9