diff --git a/.cvsignore b/.cvsignore
index 687aa5d..399b64c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-quagga-0.96.4.tar.gz
+quagga-0.96.5.tar.gz
diff --git a/quagga.spec b/quagga.spec
index c639af0..cb4b5b3 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -10,6 +10,7 @@
 %define		with_ipv6	1
 %define		with_ospfclient 1
 %define		with_ospfapi	1
+%define         with_rtadv      1
 %define		with_multipath	64
 %define		quagga_uid      92
 %define		quagga_gid      92
@@ -24,25 +25,21 @@
 
 # defines for configure
 %define		_libexecdir	%{_exec_prefix}/libexec/quagga
-%define		_includedir	%{_prefix}/include/quagga
+%define		_includedir	%{_prefix}/include
 %define		_libdir		%{_exec_prefix}/%{_lib}/quagga
 %define		_localstatedir	/var/run/quagga
 
 Summary: Routing daemon
 Name:		quagga
-Version:	0.96.4
-Release: 1.1
+Version:	0.96.5
+Release:	0
+Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
 Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
 Source1:        quagga-filter-perl-requires.sh
-#Patch0:         quagga-0.96.1-libcap.patch
-Patch1:         quagga-0.96.1-warnings.patch
-Patch2:         quagga-0.96.2-sysconfig.patch
-Patch3:         quagga-0.96.2-lib64.patch
-#Patch4:         quagga-0.96.3-warnings.patch
-#Patch5:         quagga-0.96.3-remote_dos.patch
-Patch6:         quagga-0.96.3-netlink.patch
+Patch0:         quagga-0.96.2-lib64.patch
+Patch1:         quagga-0.96.3-netlink.patch
 URL:		http://www.quagga.net
 %if %with_snmp
 BuildRequires:	ucd-snmp-devel
@@ -93,13 +90,8 @@ developing OSPF-API and quagga applications.
 
 %prep
 %setup  -q
-#%patch0 -p1 -b .libcap
-%patch1 -p1 -b .warnings
-%patch2 -p1 -b .sysconfig
-%patch3 -p1 -b .lib64
-#%patch4 -p1 -b .warnings4
-#%patch5 -p1 -b .remote_dos
-%patch6 -p1 -b .netlink
+%patch0 -p1 -b .lib64
+%patch1 -p1 -b .netlink
 
 %build
 CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
@@ -147,6 +139,9 @@ CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
 %if %vty_group
 	--enable-vty-group=%vty_group \
 %endif
+%if %with_rtadv
+	--with-rtadv \
+%endif
 --with-cflags="-O2" \
 --enable-netlink
 
@@ -189,9 +184,12 @@ groupadd -r %vty_group 2> /dev/null || :
 # add quagga user and group
 %if %quagga_user
 # Ensure that quagga_gid gets correctly allocated
-/usr/sbin/groupadd -g %quagga_gid quagga 2> /dev/null || :
-/usr/sbin/useradd -u %quagga_uid -g %quagga_gid -M -r -s /sbin/nologin \
- -c "Quagga routing suite" -d %_localstatedir %quagga_user 2> /dev/null || :
+if getent group %quagga_user >/dev/null 2>&1 ; then : ; else \
+ /usr/sbin/groupadd -g %quagga_gid %quagga_user > /dev/null 2>&1 || exit 1 ; fi
+if getent passwd %quagga_user >/dev/null 2>&1 ; then : ; else \
+ /usr/sbin/useradd -u %quagga_uid -g %quagga_gid -M -r -s /sbin/nologin \
+ -c "Quagga routing suite" -d %_localstatedir %quagga_user 2> /dev/null \
+ || exit 1 ; fi
 %endif
 
 %post
@@ -318,17 +316,28 @@ fi
 %files devel
 %defattr(-,root,root)
 %dir %{_libdir}/*
-%dir %{_includedir}
-%{_includedir}/*.h
-%dir %{_includedir}/ospfd/*
+%dir %{_includedir}/quagga
+%{_includedir}/quagga/*.h
+%dir %{_includedir}/quagga/ospfd/*
 %if %with_ospfapi
-%dir %{_includedir}/ospfapi/*
+%dir %{_includedir}/quagga/ospfapi/*
 %endif
 
 %changelog
+* Tue May 4 2004 Jay Fenlason <fenlason@redhat.com> 0.96.5-0
+- New upstream version
+- Change includedir
+- Change the pre scriptlet to fail if the useradd command fails.
+- Remove obsolete patches from this .spec file and renumber the two
+  remaining ones.
+
 * Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
+* Fri Feb 13 2004 Jay Fenlason <fenlason@redhat.com>
+- Add --enable-rtadv, to turn ipv6 router advertisement back on.  Closes
+  bugzilla #114691
+
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 4e571b2..19f515b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55f5a307c453f90d7dfcc13f0dabb83d  quagga-0.96.4.tar.gz
+cc84ef15cf4c2823a36097fe01775dc3  quagga-0.96.5.tar.gz