diff --git a/cache_swap.sh b/cache_swap.sh
index b714e66..5e94072 100644
--- a/cache_swap.sh
+++ b/cache_swap.sh
@@ -11,6 +11,6 @@ CACHE_SWAP=`sed -e 's/#.*//g' $SQUID_CONF | \
 for adir in $CACHE_SWAP; do
 	if [ ! -d $adir/00 ]; then
 		echo -n "init_cache_dir $adir... "
-		squid -z -F -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
+		squid -N -z -F -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
 	fi
 done
diff --git a/squid.nm b/squid.nm
index 7deee94..314062f 100755
--- a/squid.nm
+++ b/squid.nm
@@ -1,5 +1,7 @@
 #!/bin/sh
 
-if [ "$2" = "up" ]; then
-	/sbin/service squid reload || :
-fi
+case "$2" in
+        up|down|vpn-up|vpn-down)
+                /bin/systemctl reload squid.service || :
+                ;;
+esac
diff --git a/squid.service b/squid.service
index bf72dd1..5fa70ac 100644
--- a/squid.service
+++ b/squid.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Squid caching proxy
-After=syslog.target network.target named.service
+After=syslog.target network.target nss-lookup.target
 
 [Service]
 Type=forking
@@ -10,6 +10,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
+PIDFile=/var/run/squid.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/squid.spec b/squid.spec
index b8eaf7a..a5c32c2 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.2.3
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -64,6 +64,8 @@ BuildRequires: libcap-devel
 BuildRequires: libecap-devel
 # 
 BuildRequires: libtool libtool-ltdl-devel
+# For test suite
+BuildRequires: cppunit-devel
 
 %description
 Squid is a high-performance proxy caching server for Web clients,
@@ -111,7 +113,7 @@ The squid-sysvinit contains SysV initscritps support.
    CXXFLAGS="$RPM_OPT_FLAGS -fpie" \
    CFLAGS="$RPM_OPT_FLAGS -fpie" \
 %endif
-LDFLAGS="-pie"
+LDFLAGS="$RPM_LD_FLAGS -pie"
 
 %configure \
    --disable-strict-error-checking \
@@ -123,7 +125,7 @@ LDFLAGS="-pie"
    --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
-   --enable-arp-acl \
+   --enable-eui \
    --enable-follow-x-forwarded-for \
    --enable-auth \
    --enable-auth-basic="DB,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,getpwnam" \
@@ -141,13 +143,11 @@ LDFLAGS="-pie"
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
    --enable-ssl \
    --enable-ssl-crtd \
    --enable-storeio="aufs,diskd,ufs" \
-   --enable-useragent-log \
    --enable-wccpv2 \
    --enable-esi \
    --enable-ecap \
@@ -162,6 +162,9 @@ make \
 	DEFAULT_SWAP_DIR='$(localstatedir)/spool/squid' \
 	%{?_smp_mflags}
 
+%check
+make check
+	
 %install
 rm -rf $RPM_BUILD_ROOT
 make \
@@ -304,6 +307,16 @@ fi
 %triggerpostun -n %{name}-sysvinit -- %{name} < 7:3.2.0.9-1
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
+%changelog
+* Fri Oct 26 2012 Michal Luscon <mluscon@redhat.com> - 7:3.2.2-2
+- Resolved: #854356 - squid.service use PIDFile
+- Resolved: #859393 - Improve cache_swap script
+- Resolved: #791129 - disk space warning
+- Resolved: #862252 - reload on VPN or network up/down
+- Resolved: #867531 - run test suite during build
+- Resolved: #832684 - missing after dependency nss-lookup.target
+- Removed obsolete configure options
+
 %changelog
 * Mon Oct 22 2012 Tomas Hozza <thozza@redhat.com> - 7:3.2.3-1
 - Update to latest upstream version 3.2.3