diff --git a/.gitignore b/.gitignore
index 8a6980e..227bbe2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,6 @@
 /postgresql-setup-4.0.tar.gz
-/postgresql-9.5.3-US.pdf
-/postgresql-9.5.4-US.pdf
-/postgresql-9.5.3.tar.bz2
-/postgresql-9.5.3.tar.bz2.sha256
-/postgresql-9.4.8.tar.bz2
-/postgresql-9.4.8.tar.bz2.sha256
-/postgresql-9.4.9.tar.bz2
-/postgresql-9.4.9.tar.bz2.sha256
 /postgresql-9.5.4.tar.bz2
 /postgresql-9.5.4.tar.bz2.sha256
+/postgresql-9.6.0-US.pdf
+/postgresql-9.6.0.tar.bz2
+/postgresql-9.6.0.tar.gz.sha256
diff --git a/postgresql-config-comment.patch b/postgresql-config-comment.patch
deleted file mode 100644
index 03f9cbe..0000000
--- a/postgresql-config-comment.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Add note warning users that Postgres' port number is forced in the service
-file, mainly because it's traditional in Red Hat installations to set it
-there rather than in postgresql.conf.  (There are minor usability benefits
-to doing it this way though, for example that the postmaster's port number
-is visible in "ps" as part of its command line.)
-
-
-diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample
---- postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample	2012-08-23 18:06:49.000000000 -0400
-+++ postgresql-9.2rc1/src/backend/utils/misc/postgresql.conf.sample	2012-09-01 21:57:55.498629897 -0400
-@@ -61,6 +61,8 @@
- 					# defaults to 'localhost'; use '*' for all
- 					# (change requires restart)
- #port = 5432				# (change requires restart)
-+# Note: In RHEL/Fedora installations, you can't set the port number here;
-+# adjust it in the service file instead.
- #max_connections = 100			# (change requires restart)
- #superuser_reserved_connections = 3	# (change requires restart)
- #unix_socket_directories = '/tmp'	# comma-separated list of directories
diff --git a/postgresql.spec b/postgresql.spec
index eaaca84..4975fcf 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -65,8 +65,8 @@
 
 Summary: PostgreSQL client programs
 Name: postgresql
-%global majorversion 9.5
-Version: 9.5.4
+%global majorversion 9.6
+Version: 9.6.0
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -82,8 +82,8 @@ Url: http://www.postgresql.org/
 # in-place upgrade of an old database.  In most cases it will not be critical
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
-%global prevversion 9.4.9
-%global prevmajorversion 9.4
+%global prevversion 9.5.4
+%global prevmajorversion 9.5
 
 %global setup_version 4.0
 
@@ -112,7 +112,6 @@ Source17: ftp://ftp.postgresql.org/pub/source/v%{prevversion}/postgresql-%{prevv
 Patch1: rpm-pgsql.patch
 Patch2: postgresql-logging.patch
 Patch3: postgresql-perl-rpath.patch
-Patch4: postgresql-config-comment.patch
 Patch5: postgresql-var-run-socket.patch
 Patch6: postgresql-man.patch
 
@@ -362,7 +361,6 @@ benchmarks.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 
@@ -492,6 +490,10 @@ export PYTHON=/usr/bin/python3
 cd src/backend
 make submake-errcodes
 cd ../..
+# This line somehow fixes build under 9.6
+# originaly it contained this error:
+# ../../../src/include/storage/lwlock.h:129:33: fatal error: storage/lwlocknames.h: No such file or directory
+make %{?_smp_mflags}
 cd src/pl/plpython
 make %{?_smp_mflags} all
 cd ..
@@ -970,6 +972,7 @@ fi
 %{_bindir}/vacuumlo
 %{_datadir}/pgsql/extension/adminpack*
 %{_datadir}/pgsql/extension/autoinc*
+%{_datadir}/pgsql/extension/bloom*
 %{_datadir}/pgsql/extension/btree_gin*
 %{_datadir}/pgsql/extension/btree_gist*
 %{_datadir}/pgsql/extension/chkpass*
@@ -995,6 +998,7 @@ fi
 %{_datadir}/pgsql/extension/pg_prewarm*
 %{_datadir}/pgsql/extension/pg_stat_statements*
 %{_datadir}/pgsql/extension/pg_trgm*
+%{_datadir}/pgsql/extension/pg_visibility*
 %{_datadir}/pgsql/extension/pgcrypto*
 %{_datadir}/pgsql/extension/pgrowlocks*
 %{_datadir}/pgsql/extension/pgstattuple*
@@ -1013,6 +1017,7 @@ fi
 %{_libdir}/pgsql/auth_delay.so
 %{_libdir}/pgsql/auto_explain.so
 %{_libdir}/pgsql/autoinc.so
+%{_libdir}/pgsql/bloom.so
 %{_libdir}/pgsql/btree_gin.so
 %{_libdir}/pgsql/btree_gist.so
 %{_libdir}/pgsql/chkpass.so
@@ -1045,6 +1050,7 @@ fi
 %{_libdir}/pgsql/pg_freespacemap.so
 %{_libdir}/pgsql/pg_stat_statements.so
 %{_libdir}/pgsql/pg_trgm.so
+%{_libdir}/pgsql/pg_visibility.so
 %{_libdir}/pgsql/pgcrypto.so
 %{_libdir}/pgsql/pgrowlocks.so
 %{_libdir}/pgsql/pgstattuple.so
@@ -1174,6 +1180,7 @@ fi
 
 %files static
 %{_libdir}/libpgcommon.a
+%{_libdir}/libpgfeutils.a
 %{_libdir}/libpgport.a
 
 %if %upgrade
@@ -1216,6 +1223,10 @@ fi
 %endif
 
 %changelog
+* Fri Sep 30 2016 Pavel Raiskup <praiskup@redhat.com> - 9.6.0-1
+- update to 9.6.0 per release notes:
+  https://www.postgresql.org/docs/9.6/static/release-9-6.html
+
 * Fri Aug 12 2016 Petr Kubat <pkubat@redhat.com> - 9.5.4-1
 - update to 9.5.4 per release notes:
   http://www.postgresql.org/docs/9.5/static/release-9-5-4.html
diff --git a/sources b/sources
index 45a729b..efe22a4 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 3cd80dbdb03dba0131d7b6a11ae1a24c  postgresql-setup-4.0.tar.gz
 ad36fcf624748b8ed67783ad04529f43  postgresql-9.5.4.tar.bz2
-cb2960fb4022d57f9d7cf421a592a7c0  postgresql-9.4.9.tar.bz2
-c0cc4410822bf69f6939361fc33cfb15  postgresql-9.4.9.tar.bz2.sha256
 791291e31348bf4619048a8b06e2231d  postgresql-9.5.4.tar.bz2.sha256
-6bf9dc43855903b6bef6c515643b5c8b  postgresql-9.5.4-US.pdf
+3e0ebaec6809351b3ed66bf8fb39d0db  postgresql-9.6.0-US.pdf
+c5af6ebb790ab877e1d2e56e19cebb29  postgresql-9.6.0.tar.bz2
+daaf3118bac57c3a9e15c1beffd1d404  postgresql-9.6.0.tar.gz.sha256