diff --git a/squid.init b/squid.init
index a2eeee2..7c15ae8 100644
--- a/squid.init
+++ b/squid.init
@@ -54,11 +54,11 @@ start() {
     for adir in $CACHE_SWAP; do
         if [ ! -d $adir/00 ]; then 
 	     echo -n "init_cache_dir $adir... "
-	     $SQUID -z -F -D 2>/dev/null
+	     $SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
 	fi
     done
     echo -n $"Starting $prog: "
-    $SQUID $SQUID_OPTS 2> /dev/null
+    $SQUID $SQUID_OPTS >> /var/log/squid/squid.out 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ]; then 
        timeout=0;
@@ -81,7 +81,7 @@ start() {
 
 stop() {
     echo -n  $"Stopping $prog: "
-    $SQUID -k check >/dev/null 2>&1
+    $SQUID -k check >> /var/log/squid/squid.out 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
         $SQUID -k shutdown &
diff --git a/squid.pam b/squid.pam
new file mode 100644
index 0000000..049f1a0
--- /dev/null
+++ b/squid.pam
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth		required	pam_stack.so service=system-auth
+account		required	pam_stack.so service=system-auth
diff --git a/squid.spec b/squid.spec
index 9a56a4e..e6302cf 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.5.STABLE5
-Release: 1
+Release: 2
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -14,6 +14,7 @@ Source1: http://www.squid-cache.org/Squid/FAQ/FAQ.sgml
 Source2: squid.init
 Source3: squid.logrotate
 Source4: squid.sysconfig
+Source5: squid.pam
 Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 Patch1: squid-2.5.STABLE3-config.patch
@@ -21,6 +22,19 @@ Patch1: squid-2.5.STABLE3-config.patch
 Patch3: squid-2.5.STABLE4-location.patch
 Patch4: squid-2.5.STABLE3-build.patch
 Patch5: squid-2.5.STABLE4-perlpath.patch
+Patch6: squid-2.5.STABLE5-pipe.patch
+Patch7: squid-2.5.STABLE5-warning.patch
+
+Patch100: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ntlm_assert.patch
+Patch101: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-ldap.patch
+Patch102: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-helper_warning.patch
+Patch103: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-pkgconfig.patch
+Patch104: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-vary.patch
+Patch105: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-lin22_poll.patch
+Patch106: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-version.patch
+Patch107: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-deny_info.patch
+Patch108: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-CONNECT_timeout.patch
+Patch109: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-cache_swap_log.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -47,6 +61,18 @@ lookup program (dnsserver), a program for retrieving FTP data
 %patch3 -p1 -b .location
 %patch4 -p1 -b .build
 %patch5 -p1 -b .perlpath
+%patch6 -p1 -b .pipe
+%patch7 -p1 -b .warning
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
 
 %build
  export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; 
@@ -103,10 +129,11 @@ ln -s %{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
-
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
 mkdir -p $RPM_BUILD_ROOT/var/spool/squid
 
@@ -125,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
+%attr(644,root,root) /etc/pam.d/squid
 %config(noreplace) /etc/squid/squid.conf
 %config(noreplace) /etc/squid/mime.conf
 %config(noreplace) /etc/sysconfig/squid
@@ -147,7 +175,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/squid/*
 
 %pre
-/usr/sbin/useradd -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1
+if getent passwd squid >/dev/null 2>&1 ; then : ; else /usr/sbin/useradd -u 23 -d /var/spool/squid -r -s /sbin/nologin squid >/dev/null 2>&1 || exit 1 ; fi
 
 for i in /var/log/squid /var/spool/squid ; do
 	if [ -d $i ] ; then
@@ -261,6 +289,19 @@ if [ "$1" -ge "1" ] ; then
 fi
 
 %changelog
+* Mon Apr 5 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE5-2
+- Include the first 10 upstream patches
+- Add a patch for the correct location of the winbindd pipe.  This closes
+  bugzilla #107561
+- Remove the change to ssl_support.c from squid-2.5.STABLE3-build patch
+  This closes #117851
+- Include /etc/pam.d/squid .  This closes #113404
+- Include a patch to close #111254 (assignment in assert)
+- Change squid.init to put output messages in /var/log/squid/squid.out
+  This closes #104697
+- Only useradd the squid user if it doesn't already exist, and error out
+  if the useradd fails.  This closes #118718.
+
 * Tue Mar 2 2004 Jay Fenlason <fenlason@redhat.com> 7:2.5.STABLE5-1
 - New upstream version, obsoletes many patches.
 - Fix --datadir passed to configure.  Configure automatically adds /squid