diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d0676e951..3cbca0dba 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,21 @@
-->
+
+ 2016-01-17
+
+
+ [dj] - Sync to LFS r10986.
+
+
+ [dj] - Update to linux-4.4 - Merged from trunk.
+
+
+ [dj] - Update to iproute2-4.4.0 - Merged from trunk.
+
+
+
+
2016-01-02
diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml
index 9d286210f..d65e23e53 100644
--- a/chapter06/iproute2.xml
+++ b/chapter06/iproute2.xml
@@ -41,32 +41,19 @@
Installation of IPRoute2
- The arpd binary included in this package is
- dependent on Berkeley DB. Because arpd is not a very
- common requirement on a base Linux system, remove the dependency on Berkeley
- DB by applying the commands below. If the arpd binary is
- needed, instructions for compiling Berkeley DB can be found in the BLFS Book
- at .
+ The arpd program included in this package will not
+ be built since it is dependent on Berkeley DB, which is not installed in
+ LFS. However, documentation files and a directory for
+ arpd will still be installed. Prevent this by running
+ the commands below. If the arpd binary is needed,
+ instructions for compiling Berkeley DB can be found in the BLFS Book at
+ .
-sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
-sed -i /ARPD/d Makefile
-sed -i 's/arpd.8//' man/man8/Makefile
+sed -i /ARPD/d Makefile
+sed -i 's/arpd.8//' man/man8/Makefile
+rm -v doc/arpd.sgml
-
-
Compile the package:
make
diff --git a/general.ent b/general.ent
index 9b3cd7d97..80682e8d0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
+
-
+
diff --git a/packages.ent b/packages.ent
index 835225fdb..68cd41c6b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -317,10 +317,10 @@
-
-
+
+
-
+
@@ -374,13 +374,13 @@
-
-
-
-
-
+
+
+
+
+
-
+