diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index 627f3b963..97171723a 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -60,7 +60,6 @@ package quicker.
&ac-psmisc;
&ac-shadowpwd;
&ac-sysklogd;
-&ac-sysklogd-patch;
&ac-sysvinit;
&ac-sysvinit-patch;
&ac-utillinux;
diff --git a/Attic/appendixc/sysklogd-patch.xml b/Attic/appendixc/sysklogd-patch.xml
deleted file mode 100644
index 272fa1678..000000000
--- a/Attic/appendixc/sysklogd-patch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-Sysklogd Patch (&sysklogd-version;):
-
-&ftp-common;/
-
-&http-common;/
-
diff --git a/chapter04/man.xml b/chapter04/man.xml
index 4e73ea3d4..d940a69da 100644
--- a/chapter04/man.xml
+++ b/chapter04/man.xml
@@ -1,6 +1,6 @@
Man (&man-version;) 156 KB:
-
-&ftp-common;/man-&man-version;.tar.bz2
-
-&http-common;/man-&man-version;.tar.bz2
+
+&ftp-cvs;/man-&man-version;.tar.bz2
+
+&http-cvs;/man-&man-version;.tar.bz2
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index eab63e2ae..1490006fd 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -57,7 +57,6 @@
&c3-psmisc;
&c3-shadowpwd;
&c3-sysklogd;
-&c3-sysklogd-patch;
&c3-sysvinit;
&c3-sysvinit-patch;
&c3-utillinux;
diff --git a/chapter04/shadowpwd.xml b/chapter04/shadowpwd.xml
index dcc940124..b43d69b3d 100644
--- a/chapter04/shadowpwd.xml
+++ b/chapter04/shadowpwd.xml
@@ -1,6 +1,6 @@
Shadow Password Suite (&shadow-version;) 557 KB:
-
-&ftp-common;/shadow-&shadow-version;.tar.bz2
-
-&http-common;/shadow-&shadow-version;.tar.bz2
+
+&ftp-cvs;/shadow-&shadow-version;.tar.bz2
+
+&http-cvs;/shadow-&shadow-version;.tar.bz2
diff --git a/chapter04/sysklogd-patch.xml b/chapter04/sysklogd-patch.xml
deleted file mode 100644
index a1396c5ef..000000000
--- a/chapter04/sysklogd-patch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-Sysklogd Patch (&sysklogd-version;) 0.5 KB:
-
-&ftp-common;/sysklogd-&sysklogd-version;.patch.bz2
-
-&http-common;/sysklogd-&sysklogd-version;.patch.bz2
-
diff --git a/chapter04/sysklogd.xml b/chapter04/sysklogd.xml
index f679ee5dc..abbc6fd4f 100644
--- a/chapter04/sysklogd.xml
+++ b/chapter04/sysklogd.xml
@@ -1,6 +1,6 @@
Sysklogd (&sysklogd-version;) 67 KB:
-
-&ftp-common;/sysklogd-&sysklogd-version;.tar.bz2
-
-&http-common;/sysklogd-&sysklogd-version;.tar.bz2
+
+&ftp-cvs;/sysklogd-&sysklogd-version;.tar.bz2
+
+&http-cvs;/sysklogd-&sysklogd-version;.tar.bz2
diff --git a/index.xml b/index.xml
index 1a71016e8..4b45a075b 100644
--- a/index.xml
+++ b/index.xml
@@ -126,7 +126,6 @@
-
@@ -517,7 +516,6 @@
-
@@ -551,7 +549,7 @@
-
+
@@ -568,8 +566,8 @@
-
-
+
+