diff --git a/squid.service b/squid.service
index a6f82cf..d9ce898 100644
--- a/squid.service
+++ b/squid.service
@@ -4,6 +4,8 @@ After=syslog.target network.target nss-lookup.target
 
 [Service]
 Type=forking
+User=squid
+Group=squid
 LimitNOFILE=16384
 EnvironmentFile=/etc/sysconfig/squid
 ExecStartPre=/usr/libexec/squid/cache_swap.sh
diff --git a/squid.spec b/squid.spec
index bdc22d7..4aa09b3 100644
--- a/squid.spec
+++ b/squid.spec
@@ -2,7 +2,7 @@
 
 Name:     squid
 Version:  3.4.5
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -112,7 +112,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now"
    --datadir=%{_datadir}/squid \
    --sysconfdir=%{_sysconfdir}/squid \
    --with-logdir='%{_localstatedir}/log/squid' \
-   --with-pidfile='%{_localstatedir}/run/squid.pid' \
+   --with-pidfile='%{_localstatedir}/run/squid/squid.pid' \
    --disable-dependency-tracking \
    --enable-eui \
    --enable-follow-x-forwarded-for \
@@ -290,6 +290,9 @@ fi
 
 
 %changelog
+* Sun Jun 08 2014 Michal Luscon <mluscon@redhat.com> - 7:3.4.5-5
+- Run squid under user and group squid
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7:3.4.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild