diff --git a/.cvsignore b/.cvsignore
index 99f1c61..687aa5d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-quagga-0.96.3.tar.gz
+quagga-0.96.4.tar.gz
diff --git a/quagga.spec b/quagga.spec
index 5930c9b..174f7cb 100644
--- a/quagga.spec
+++ b/quagga.spec
@@ -30,8 +30,8 @@
 
 Summary: Routing daemon
 Name:		quagga
-Version:	0.96.3
-Release:	1
+Version:	0.96.4
+Release:	0
 License:	GPL
 Group: System Environment/Daemons
 Source0:	http://www.quagga.net/download/%{name}-%{version}.tar.gz
@@ -40,8 +40,9 @@ Source1:        quagga-filter-perl-requires.sh
 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
+#Patch4:         quagga-0.96.3-warnings.patch
+#Patch5:         quagga-0.96.3-remote_dos.patch
+Patch6:         quagga-0.96.3-netlink.patch
 URL:		http://www.quagga.net
 %if %with_snmp
 BuildRequires:	ucd-snmp-devel
@@ -96,8 +97,9 @@ developing OSPF-API and quagga applications.
 %patch1 -p1 -b .warnings
 %patch2 -p1 -b .sysconfig
 %patch3 -p1 -b .lib64
-%patch4 -p1 -b .warnings4
-%patch5 -p1 -b .remote_dos
+#%patch4 -p1 -b .warnings4
+#%patch5 -p1 -b .remote_dos
+%patch6 -p1 -b .netlink
 
 %build
 CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
@@ -316,12 +318,18 @@ fi
 %files devel
 %defattr(-,root,root)
 %dir %{_libdir}/*
+%dir %{_includedir}
+%{_includedir}/*.h
 %dir %{_includedir}/ospfd/*
 %if %with_ospfapi
 %dir %{_includedir}/ospfapi/*
 %endif
 
 %changelog
+* Mon Nov 3 2003 Jay Fenlason <fenlason@redhat.com> 0.96.4-0
+- New upstream version
+- include .h files in the -devel package.
+
 * Wed Oct 15 2003 Jay Fenlason <fenlason@redhat.com> 0.96.3-1
 - Patch a remote DoS attack (#107140)
 - New upstream version
diff --git a/sources b/sources
index 71e4fa0..4e571b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a06a2c1b048302da711b4a8d51d5403a  quagga-0.96.3.tar.gz
+55f5a307c453f90d7dfcc13f0dabb83d  quagga-0.96.4.tar.gz