Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/final-system/common/iproute2.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -26,15 +26,12 @@
     <title>Installation of IPRoute2</title>
 
-    <para os="s1">By default, this package builds the <command>arpd</command>
-    program, which is dependent on Berkeley DB.  Because <command>arpd</command>
-    is not a very common requirement on a base Linux system, remove the
-    dependency on Berkeley DB by using the commands
-    below. If the <command>arpd</command> binary is needed, instructions for
-    compiling Berkeley DB can be found in CBLFS at <ulink
-    url="&cblfs-root;index.php/Berkeley_DB"/>.</para>
-
-<screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
-sed -i '/ARPD/d' Makefile
-sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
+    <para os="s1">ARPD will not be installed as Berkeley DB is not installed.
+        Remove any <command>arpd</command> references during install.</para>
+
+    <screen os="s2"><userinput>sed -i '/ARPD/d' Makefile
+            sed -i 's/arpd.8//' man/man8/Makefile
+            sed -i '/tc-simple/s@tc-skbmod.8 @@' man/man8/Makefile
+            rm -v doc/arpd.sgml
+    </userinput></screen>
 
     <para os="a">Compile the package:</para>
Index: BOOK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/final-system/multilib/iproute2.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -30,8 +30,4 @@
     xpointer="xpointer(//*[@os='s2'])"/>
 
-    <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&iproute2-libdir-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/iproute2.xml"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/introduction/common/changelog.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -43,4 +43,8 @@
           ticket <ulink url="&clfs-ticket-root;1105">#1105.</ulink></para> 
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Upgrade IProute2 to 4.9.0. Fixes
+          ticket <ulink url="&clfs-ticket-root;1103">#1103.</ulink></para> 
+        </listitem>
       </itemizedlist>
     </listitem>
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/materials/mips64/patches.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -35,8 +35,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 
Index: BOOK/materials/ppc64/patches.xml
===================================================================
--- BOOK/materials/ppc64/patches.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/materials/ppc64/patches.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -20,8 +20,4 @@
     href="../ppc/patches.xml"
     xpointer="xpointer(//*[@os='hfsutils-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/materials/sparc64/patches.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -23,8 +23,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 
Index: BOOK/materials/x86_64/patches.xml
===================================================================
--- BOOK/materials/x86_64/patches.xml	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/materials/x86_64/patches.xml	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -17,13 +17,4 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="iproute2-libdir-patch">
-      <term>IPRoute2 Lib64 Patch - <token>&iproute2-libdir-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iproute2-libdir-patch;"/></para>
-        <para>MD5 sum: <literal>&iproute2-libdir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="perl-multilib-patch">
       <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/packages.ent	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -233,10 +233,18 @@
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
 <!ENTITY iana-etc-home "https://www.archlinux.org/packages/core/any/iana-etc/">
-<!-- <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc"> -->
 
 <!ENTITY iproute2-version "4.1.1">
 <!ENTITY iproute2-size "496 KB">
+
+<!ENTITY intltool-version "0.51.0">
+<!ENTITY intltool-size "162 KB">
+<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
+<!ENTITY intltool-md5 "12e517cac2b57a0121cda351570f1e63">
+<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
+
+<!ENTITY iproute2-version "4.9.0">
+<!ENTITY iproute2-size "613 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "39290cb3a55d38dd8d10e19a3094109f">
+<!ENTITY iproute2-md5 "44a8371a4b2c40e48e4c9f98cbd41391">
 <!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ BOOK/patches.ent	(revision c416b5c088a98ad58f1e0f2e02105e86986a1f6e)
@@ -84,8 +84,4 @@
 <!-- Start of multilib patches -->
 
-<!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "c1b1d63a88f04785c02c71a32d6b9b65">
-<!ENTITY iproute2-libdir-patch-size "2.053 KB">
-
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
 <!ENTITY perl-multilib-patch-md5 "7a2893356fb80871d6e766900c278a52">
Index: tches/iproute2-4.1.1-libdir-1.patch
===================================================================
--- patches/iproute2-4.1.1-libdir-1.patch	(revision 95c1d146bbdb998f7f141f04704da2d780c1b245)
+++ 	(revision )
@@ -1,57 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 16-09-2015
-Initial Package Version: 2.6.18
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: This patch gives the ability to change the libdir.
-             Updated for Iproute2-2.6.28 by Jim Gifford
-             Updated for Iproute2-2.6.34 by Joe Ciccone
-             Updated for Iproute2-2.6.37 by Joe Ciccone
-             Renamed for Iproute2-2.6.38 by Jonathan Norman
-             Rediffed for Iproute2-3.4.0 by William Harrington
-             Rediffed for Iproute2-3.8.0 by William Harrington
-             Renamed for Iproute2-3.12.0 by William Harrington
-             Renamed for Iproute2-3.14.0 by William Harrington
-             Rediffed for Iproute2-4.1.1 by William Harrington
-
-diff -Naur iproute2-4.1.1.orig/Makefile iproute2-4.1.1/Makefile
---- iproute2-4.1.1.orig/Makefile	2015-07-06 21:57:34.000000000 +0000
-+++ iproute2-4.1.1/Makefile	2015-09-16 23:57:03.117721908 +0000
-@@ -13,7 +13,7 @@
- 
- SHARED_LIBS = y
- 
--DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
-+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
- ifneq ($(SHARED_LIBS),y)
- DEFINES+= -DNO_SHARED_LIBS
- endif
-diff -Naur iproute2-4.1.1.orig/include/iptables.h iproute2-4.1.1/include/iptables.h
---- iproute2-4.1.1.orig/include/iptables.h	2015-07-06 21:57:34.000000000 +0000
-+++ iproute2-4.1.1/include/iptables.h	2015-09-16 23:57:03.118722035 +0000
-@@ -4,8 +4,12 @@
- #include "iptables_common.h"
- #include "libiptc/libiptc.h"
- 
-+#ifndef LIBDIR
-+#define LIBDIR "/usr/lib"
-+#endif
-+
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR LIBDIR "/iptables"
- #endif
- 
- #ifndef IPPROTO_SCTP
-diff -Naur iproute2-4.1.1.orig/misc/arpd.c iproute2-4.1.1/misc/arpd.c
---- iproute2-4.1.1.orig/misc/arpd.c	2015-07-06 21:57:34.000000000 +0000
-+++ iproute2-4.1.1/misc/arpd.c	2015-09-16 23:57:03.118722035 +0000
-@@ -41,7 +41,7 @@
- int resolve_hosts;
- 
- DB	*dbase;
--char	*dbname = "/var/lib/arpd/arpd.db";
-+char   *dbname = ARPDDIR "/arpd.db";
- 
- int	ifnum;
- int	*ifvec;
