diff --git a/quagga.spec b/quagga.spec
index aeef47e..f80edb2 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -5,7 +5,6 @@
 %define		with_nssa	1
 %define		with_opaque_lsa 1
 %define		with_tcp_zebra	0
-%define		with_vtysh	1
 %define		with_pam	1
 %define		with_ipv6	1
 %define		with_ospfclient 1
@@ -32,7 +31,7 @@
 Summary: Routing daemon
 Name:		quagga
 Version:	0.98.5
-Release: 2
+Release: 3
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -42,11 +41,12 @@ Source1:        quagga-filter-perl-requires.sh
 Patch1:         quagga-0.96.3-netlink.patch
 Patch2:		quagga-0.96.5-nostart.patch
 Patch4:		quagga-0.98.2-gcc4.patch
+Patch5:		quagga-0.98.5-pam.patch
 
 URL:		http://www.quagga.net
 %if %with_snmp
-BuildRequires:	ucd-snmp-devel
-Prereq:		ucd-snmp
+BuildRequires:	net-snmp-devel
+Prereq:		net-snmp
 %endif
 %if %with_vtysh
 BuildRequires:	readline readline-devel ncurses ncurses-devel
@@ -97,9 +97,22 @@ developing OSPF-API and quagga applications.
 %patch1 -p1 -b .netlink
 %patch2 -p1 -b .nostart
 %patch4 -p1 -b .gcc4
+%patch5 -p1 -b .pam
 
 %build
-CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
+%ifarch s390 s390x
+export PIECFLAGS="-fPIE"
+%else                   
+export PIECFLAGS="-fpie"
+%endif                  
+# FC5+ automatic -fstack-protector-all switch
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
+#./autogen.sh                                                                 
+export CFLAGS="$RPM_OPT_FLAGS $PIECFLAGS $CPPFLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS $PIECFLAGS $CPPFLAGS"
+export LDFLAGS="-pie"
+
+%configure \
 %if %with_ipv6
 	--enable-ipv6 \
 %endif
@@ -147,10 +160,9 @@ CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
 %if %with_rtadv
 	--enable-rtadv \
 %endif
---with-cflags="-O2" \
 --enable-netlink
 
-CFLAGS=-fPIE ; LDFLAGS=-pie ; make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
+make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
 
 pushd doc
 texi2html quagga.texi
@@ -334,6 +346,16 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 17 2005 Jay Fenlason <fenlason@redhat.com> 0.98.5-3
+- Modify the way CFLAGS is set and passed to configure and make, so
+  we use RPMs default cflags, with -pie/-fpie added.  This gets us
+  -D_FORTIFY_SOURCE, etc, which is good for critical daemons.
+- Include -pam patch to close
+  bz#170256 ? pam_stack is deprecated
+- Change ucd-snmp to net-snmp to close
+  bz#164333 ? quagga 0.98.4-2 requires now obsolete package ucd-snmp-devel
+- also fix duplicate line mentioned in bz#164333
+
 * Mon Aug 29 2005 Jay Fenlason <fenlason@redhat.com> 0.98.5-2
 - New upstream version.