diff --git a/.gitignore b/.gitignore
index 665831f..514cfaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ squid-3.1-10021.patch
 /squid-3.1.7.tar.bz2.asc
 /squid-3.1.8.tar.bz2
 /squid-3.1.8.tar.bz2.asc
+/squid-3.1.9.tar.bz2
+/squid-3.1.9.tar.bz2.asc
diff --git a/sources b/sources
index ee5c0cf..bdecbd0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a8160dfba55ab7c400c622b72d39fc13  squid-3.1.8.tar.bz2
-df695a4df7deb9f4ff010b6ea5126e75  squid-3.1.8.tar.bz2.asc
+896ace723445ac168986ba8854437ce3  squid-3.1.9.tar.bz2
+c843b6e82042c2e98ae8f93f6a02595c  squid-3.1.9.tar.bz2.asc
diff --git a/squid.spec b/squid.spec
index 748e75a..c892d4d 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,7 +3,7 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.8
+Version:  3.1.9
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
@@ -251,8 +251,17 @@ if [ "$1" -ge "1" ] ; then
         service squid condrestart >/dev/null 2>&1
 fi
 
+%triggerin -- samba-common
+if ! getent group wbpriv >/dev/null 2>&1 ; then
+  /usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
+fi
+/usr/sbin/usermod -a -G wbpriv squid >/dev/null 2>&1 || \
+    chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 13 2010 Jiri Skala <jskala@redhat.com> - 7:3.1.8-2
+- fixes #584161 - squid userid not added to wbpriv group
+
 * Sun Sep 05 2010 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.8-1
 - Bug #630445: SQUID-2010:3 Denial of service issue