diff --git a/.gitignore b/.gitignore
index 8f6566b..306f5a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/postgresql-9.5.2-US.pdf
-SOURCES/postgresql-9.5.2.tar.bz2
+SOURCES/postgresql-9.5.4-US.pdf
+SOURCES/postgresql-9.5.4.tar.bz2
 SOURCES/postgresql-setup-4.0.tar.gz
diff --git a/.rh-postgresql95-postgresql.metadata b/.rh-postgresql95-postgresql.metadata
index baa5a74..7abe8cb 100644
--- a/.rh-postgresql95-postgresql.metadata
+++ b/.rh-postgresql95-postgresql.metadata
@@ -1,3 +1,3 @@
-3a47ae22a938d78c4ed18a2baf39959061483319 SOURCES/postgresql-9.5.2-US.pdf
-e139e5607fafd96926463123f7751086adaad724 SOURCES/postgresql-9.5.2.tar.bz2
+bd7640960061aa036e55db006662984acc94c6b0 SOURCES/postgresql-9.5.4-US.pdf
+bdbbecf691354a689c599631256d41eaa8824c66 SOURCES/postgresql-9.5.4.tar.bz2
 827528d678764c60ab37e3e73adecf6113587842 SOURCES/postgresql-setup-4.0.tar.gz
diff --git a/SOURCES/postgresql-config-comment.patch b/SOURCES/postgresql-config-comment.patch
index 9df0221..03f9cbe 100644
--- a/SOURCES/postgresql-config-comment.patch
+++ b/SOURCES/postgresql-config-comment.patch
@@ -15,5 +15,5 @@ diff -Naur postgresql-9.2rc1.orig/src/backend/utils/misc/postgresql.conf.sample 
 +# 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)
- # Note:  Increasing max_connections costs ~400 bytes of shared memory per
- # connection slot, plus lock space (see max_locks_per_transaction).
+ #superuser_reserved_connections = 3	# (change requires restart)
+ #unix_socket_directories = '/tmp'	# comma-separated list of directories
diff --git a/SOURCES/postgresql-socket-dirs-pgupgrade.patch b/SOURCES/postgresql-socket-dirs-pgupgrade.patch
index f429669..a135cd4 100644
--- a/SOURCES/postgresql-socket-dirs-pgupgrade.patch
+++ b/SOURCES/postgresql-socket-dirs-pgupgrade.patch
@@ -9,9 +9,9 @@ diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
 index 3d041ef..a9c56e0 100644
 --- a/src/bin/pg_upgrade/server.c
 +++ b/src/bin/pg_upgrade/server.c
-@@ -178,6 +178,12 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
- 	bool		pg_ctl_return = false;
- 	char		socket_string[MAXPGPATH + 200];
+@@ -191,6 +191,12 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
+ 
+ 	static bool exit_hook_registered = false;
  
 +	/* By default set to what upstream uses */
 +	int			rh_sock_dir_split = 903;
diff --git a/SPECS/postgresql.spec b/SPECS/postgresql.spec
index 7cd8dc5..f5b6b01 100644
--- a/SPECS/postgresql.spec
+++ b/SPECS/postgresql.spec
@@ -62,8 +62,8 @@
 Summary: PostgreSQL client programs
 Name: %{?scl_prefix}postgresql
 %global majorversion 9.5
-Version: 9.5.2
-Release: 2%{?dist}
+Version: 9.5.4
+Release: 1%{?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.
@@ -1155,6 +1155,14 @@ cd -
 %endif
 
 %changelog
+* Thu Aug 18 2016 Petr Kubat <pkubat@redhat.com> - 9.5.4-1
+- Rebase to 9.5.4 per release notes
+  http://www.postgresql.org/docs/9.5/static/release-9-5-4.html
+  http://www.postgresql.org/docs/9.5/static/release-9-5-3.html
+
+* Wed Jul 27 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.2-3
+- rebuild for s390x
+
 * Mon May 09 2016 Pavel Raiskup <praiskup@redhat.com> - 9.5.2-2
 - fix upgrade path from rh-postgresql94 (rhbz#1334351)
 - fix path to binary directory in Makefile.regress (rhbz#1334706)