diff --git a/.gitignore b/.gitignore
index b906101..bd285e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 /postgresql-10.1.tar.bz2.sha256
 /postgresql-9.6.6.tar.bz2
 /postgresql-9.6.6.tar.bz2.sha256
-/postgresql-setup-7.0.tar.gz
+/postgresql-setup-8.0.tar.gz
 /postgresql-10.1-US.pdf
diff --git a/postgresql.spec b/postgresql.spec
index 7c9f907..78b2f97 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 10
 Version: 10.1
-Release: 3%{?dist}
+Release: 4%{?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.
@@ -79,7 +79,7 @@ Url: http://www.postgresql.org/
 %global prevmajorversion 9.6
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 
-%global setup_version 7.0
+%global setup_version 8.0
 
 %global service_name postgresql.service
 Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
@@ -115,7 +115,7 @@ BuildRequires: perl(ExtUtils::Embed), perl-devel
 BuildRequires: perl-generators
 %endif
 BuildRequires: readline-devel zlib-devel
-BuildRequires: systemd util-linux
+BuildRequires: systemd systemd-devel util-linux
 BuildRequires: multilib-rpm-config
 
 # postgresql-setup build requires
@@ -469,6 +469,7 @@ common_configure_options='
 %endif
 	--with-system-tzdata=%_datadir/zoneinfo
 	--datadir=%_datadir/pgsql
+	--with-systemd
 '
 
 %if %plpython3
@@ -1024,7 +1025,6 @@ make -C postgresql-setup-%{setup_version} check
 %dir %{_libexecdir}/initscripts/legacy-actions/postgresql
 %{_libexecdir}/initscripts/legacy-actions/postgresql/*
 %{_libexecdir}/postgresql-check-db-dir
-%{_libexecdir}/postgresql-ctl
 %dir %{_sysconfdir}/postgresql-setup
 %dir %{_sysconfdir}/postgresql-setup/upgrade
 %config %{_sysconfdir}/postgresql-setup/upgrade/*.conf
@@ -1119,6 +1119,10 @@ make -C postgresql-setup-%{setup_version} check
 %endif
 
 %changelog
+* Tue Dec 19 2017 Pavel Raiskup <praiskup@redhat.com> - 10.1-4
+- configure with --with-systemd (rhbz#1414314)
+- disable startup timeout of PostgreSQL service (rhbz#1525477)
+
 * Wed Dec 13 2017 Pavel Raiskup <praiskup@redhat.com> - 10.1-3
 - unify %%configure options for python2/python3 configure
 - drop --with-krb5 option, not supported since PostgreSQL 9.4
diff --git a/sources b/sources
index 657ef45..20e11ea 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718
 SHA512 (postgresql-10.1.tar.bz2.sha256) = 7f9d35825e81598841bd01d44ae9e3af9814c1af60c5fd8292a326f8ff7006975e1a19f9777c994151c61b4c0ec9d8f0214ceae8e3f41239b706c212ffe6df62
 SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc
 SHA512 (postgresql-9.6.6.tar.bz2.sha256) = 8ab0aadd03923bf7888f6de055432f7a0bca0c4d3287d38490ae542d87d22e5753b62f1fc30474e9d875b0317a94266bbda5ad4b2cf2dada2b2c480cd9a05772
-SHA512 (postgresql-setup-7.0.tar.gz) = aabdfa55e7d9f274aab0a98735e60e12169265927da6242072f8bb3b4ae6d729a6c7318e15e0dc38662d999429a6f98c1dc0a5e1b4809ebdba8645298f362bcc
+SHA512 (postgresql-setup-8.0.tar.gz) = 306b05b5aa3c2ad4419b1a9584d5ca9b1dc2e8f80bf2602e4f76cd23671a6cbd84a34bbf139db17ac917e5cddd12c3fa5d6fce50f80132443233bcd15964932a
 SHA512 (postgresql-10.1-US.pdf) = 8bbd10fc2e3704af0a82f9c4c0aa483109ff606bd784e923831ac7be8ff833245fe3036129a74cc5e01ec2a89f6519f625aa18ff27132a9c314b3db51fcddb5b