diff --git a/.gitignore b/.gitignore
index eaa5b1a..e519bed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /pgpool-II-3.5.2.tar.gz
 /pgpool-II-3.5.3.tar.gz
 /pgpool-II-3.5.4.tar.gz
+/pgpool-II-3.6.0.tar.gz
diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec
index 6aedbc1..5787424 100644
--- a/postgresql-pgpool-II.spec
+++ b/postgresql-pgpool-II.spec
@@ -9,8 +9,8 @@
 
 Summary:		Pgpool is a connection pooling/replication server for PostgreSQL
 Name:			postgresql-%{short_name}
-Version:		3.5.4
-Release:		3%{?dist}
+Version:		3.6.0
+Release:		1%{?dist}
 License:		BSD
 Group:			Applications/Databases
 URL:			http://pgpool.net
@@ -174,8 +174,10 @@ fi
 %endif
 
 %files
-%doc README TODO COPYING AUTHORS ChangeLog NEWS doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css doc/tutorial-en.html doc/tutorial-ja.html
+%doc README TODO COPYING AUTHORS ChangeLog NEWS
 %{_bindir}/pgpool
+%{_bindir}/pgpool_setup
+%{_bindir}/watchdog_setup
 %{_bindir}/pcp_attach_node
 %{_bindir}/pcp_detach_node
 %{_bindir}/pcp_node_count
@@ -188,7 +190,6 @@ fi
 %{_bindir}/pcp_stop_pgpool
 %{_bindir}/pcp_watchdog_info
 %{_bindir}/pg_md5
-%{_mandir}/man8/pgpool*
 %dir %{_datadir}/%{short_name}
 %{_datadir}/%{short_name}/insert_lock.sql
 %{_datadir}/%{short_name}/pgpool.conf.sample-master-slave
@@ -228,6 +229,16 @@ fi
 
 
 %changelog
+* Mon Nov 21 2016 Jozef Mlich <imlich@fit.vutbr.cz> - 3.6.0-1
+- rebuild for pgpool 3.6.0
+  Improve the behavior of fail-over.
+  New PGPOOL SET command has been introduced.
+  Watchdog is significantly enhanced.
+  Handling of extended query protocol (e.g. used by Java applications) in streaming replication mode speeds up if many rows are returned in a result set.
+  Import parser of PostgreSQL 9.6.
+  In some cases pg_terminate_backend() now does not trigger a fail-over.
+  Change documentation format from raw HTML to SGML.
+
 * Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 3.5.4-3
 - bump: build in rawhide done too early
 
diff --git a/sources b/sources
index 315026a..f2886a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28d3fb3ff2a374cb25c0b26689bb813b  pgpool-II-3.5.4.tar.gz
+26f0e249067d150f01a9ca02804700eb  pgpool-II-3.6.0.tar.gz