diff --git a/squid.service b/squid.service
index da1c0ea..f49d7db 100644
--- a/squid.service
+++ b/squid.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Squid caching proxy
-After=network.target nss-lookup.target
+Documentation=man:squid(8)
+After=network.target network-online.target nss-lookup.target
 
 [Service]
 Type=forking
diff --git a/squid.spec b/squid.spec
index 793a28b..0beaf88 100644
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@
 
 Name:     squid
 Version:  4.6
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -94,11 +94,6 @@ lookup program (dnsserver), a program for retrieving FTP data
 # cppunit-config patch changes configure.ac
 autoconf
 
-# libtool fails somewhat on -fpie. PIC also works for -pie
-CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
-CFLAGS="$RPM_OPT_FLAGS -fPIC"
-LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
-
 # NIS helper has been removed because of the following bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=1531540
 %configure \
@@ -146,19 +141,17 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
    --disable-arch-native \
    --with-pic \
    --disable-security-cert-validators \
-   --disable-strict-error-checking
+   --disable-strict-error-checking \
+   --with-swapdir=%{_localstatedir}/spool/squid
 
-make \
-	DEFAULT_SWAP_DIR=%{_localstatedir}/spool/squid \
-	%{?_smp_mflags}
+%make_build
 
 %check
 make check
 	
 %install
-make \
-	DESTDIR=$RPM_BUILD_ROOT \
-	install
+%make_install
+
 echo "
 #
 # This is %{_sysconfdir}/httpd/conf.d/squid.conf
@@ -292,6 +285,9 @@ fi
 
 
 %changelog
+* Fri May 17 2019 Luboš Uhliarik <luhliari@redhat.com> - 7:4.6-3
+- Resolves: #1709299 - Use upstream squid.service
+
 * Mon Apr 29 2019 Lubos Uhliarik <luhliari@redhat.com> - 7:4.6-2
 - Resolves: #1599074 - squid: 3 coredumps every day
 
diff --git a/squid.sysconfig b/squid.sysconfig
index 3864bd8..f01b6e3 100644
--- a/squid.sysconfig
+++ b/squid.sysconfig
@@ -1,9 +1,5 @@
 # default squid options
 SQUID_OPTS=""
 
-# Time to wait for Squid to shut down when asked. Should not be necessary
-# most of the time.
-SQUID_SHUTDOWN_TIMEOUT=100
-
 # default squid conf file
 SQUID_CONF="/etc/squid/squid.conf"