diff --git a/iproute.spec b/iproute.spec
index 540c882..66b5c30 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -1,12 +1,13 @@
 Summary: Enhanced IP routing and network devices configuration tools
 Name: iproute
 Version: 2.2.4
-Release: 7
+Release: 8
 Group: Applications/System
 Source: ftp://ftp.inr.ac.ru/ip-routing/iproute2-current.tar.gz
 Patch0: iproute2-2.2.4-docmake.patch
 Patch1: iproute2-2.2.4-glibc22.patch
 Patch2: iproute2-misc.patch
+Patch3: iproute2-config.patch
 Copyright: GPL
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -21,6 +22,7 @@ utilities (/sbin/ip, /sbin/rtmon).
 %patch0 -p1 -b .doc
 %patch1 -p1 -b .glibc22
 %patch2 -p1 -b .misc
+%patch3 -p1
 
 %build
 make
@@ -30,23 +32,30 @@ make -C doc
 rm -rf $RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT/sbin \
-	$RPM_BUILD_ROOT%{_sbindir}
+ 	 $RPM_BUILD_ROOT%{_sbindir} \
+         $RPM_BUILD_ROOT/etc/iproute2
 
 install -s -m 755 ip/ip ip/ifcfg ip/rtmon tc/tc $RPM_BUILD_ROOT/sbin
 install -s -m 755 ip/rtacct $RPM_BUILD_ROOT%{_sbindir}
 
+cp -f etc/iproute2/* $RPM_BUILD_ROOT/etc/iproute2
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%dir /etc/iproute2
 %doc README.decnet README.iproute2+tc RELNOTES
 %doc doc/*.ps examples
-%doc etc/iproute2
 /sbin/*
+%attr(644,root,root) %config(noreplace) /etc/iproute2/*
 %{_sbindir}/*
 
 %changelog
+* Thu Oct 12 2000 Than Ngo <than@redhat.com>
+- add default configuration files for iproute (Bug #10549, #18887)
+
 * Tue Jul 25 2000 Jakub Jelinek <jakub@redhat.com>
 - fix include-glibc/ to cope with glibc 2.2 new resolver headers