diff --git a/squid.service b/squid.service
index d9ce898..5c7ecbc 100644
--- a/squid.service
+++ b/squid.service
@@ -12,6 +12,7 @@ ExecStartPre=/usr/libexec/squid/cache_swap.sh
 ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF
 ExecReload=/usr/sbin/squid $SQUID_OPTS -k reconfigure -f $SQUID_CONF
 ExecStop=/usr/sbin/squid -k shutdown -f $SQUID_CONF
+TimeoutSec=0
 
 [Install]
 WantedBy=multi-user.target
diff --git a/squid.spec b/squid.spec
index 4aa09b3..fed88a2 100644
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@
 
 Name:     squid
 Version:  3.4.5
-Release:  5%{?dist}
+Release:  6%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -290,6 +290,9 @@ fi
 
 
 %changelog
+* Fri Jun 13 2014 Michal Luscon <mluscon@redhat.com> - 7:3.4.5-6
+- Fixed #855111: set unlimited start and shutdown timeout
+
 * Sun Jun 08 2014 Michal Luscon <mluscon@redhat.com> - 7:3.4.5-5
 - Run squid under user and group squid