diff --git a/index.xml b/index.xml
index 3c8a6ee72..c53fa4b3a 100644
--- a/index.xml
+++ b/index.xml
@@ -589,6 +589,8 @@
 <!ENTITY bash-time-static "3 minutes">
 <!ENTITY bash-compsize "19 MB">
 <!ENTITY bash-time "3 minutes">
+<!ENTITY bash-package "bash-&bash-version;.tar.bz2">
+<!ENTITY bash-dir "bash-&bash-version;">
 
 <!ENTITY binutils-version "2.11.2">
 <!ENTITY binutils-depversion "2.11.2">
@@ -597,6 +599,8 @@
 <!ENTITY binutils-time-static "6 minutes">
 <!ENTITY binutils-compsize "85 MB">
 <!ENTITY binutils-time "6 minutes">
+<!ENTITY binutils-package "binutils-&binutils-version;.tar.bz2">
+<!ENTITY binutils-dir "binutils-&binutils-version;">
 
 <!ENTITY bzip2-version "1.0.1">
 <!ENTITY bzip2-depversion "1.0.1">
@@ -605,6 +609,8 @@
 <!ENTITY bzip2-time-static "1 minute">
 <!ENTITY bzip2-compsize "2 MB">
 <!ENTITY bzip2-time "1 minute">
+<!ENTITY bzip2-package "bzip2-&bzip2-version;.tar.bz2">
+<!ENTITY bzip2-dir "bzip2-&bzip2-version;">
 
 <!ENTITY diffutils-version "2.7">
 <!ENTITY diffutils-depversion "2.7">
@@ -613,14 +619,19 @@
 <!ENTITY diffutils-time-static "1 minute">
 <!ENTITY diffutils-compsize "2 MB">
 <!ENTITY diffutils-time "1 minute">
+<!ENTITY diffutils-package "diffutils-&diffutils-version;.tar.bz2">
+<!ENTITY diffutils-dir "diffutils-&diffutils-version;">
 
 <!ENTITY fileutils-version "4.1">
 <!ENTITY fileutils-depversion "4.1">
+<!ENTITY fileutils-depversion "4.1">
 <!ENTITY fileutils-size "1217 KB">
 <!ENTITY fileutils-compsize-static "25 MB">
 <!ENTITY fileutils-time-static "3 minutes">
 <!ENTITY fileutils-compsize "16 MB">
 <!ENTITY fileutils-time "3 minutes">
+<!ENTITY fileutils-package "fileutils-&fileutils-version;.tar.bz2">
+<!ENTITY fileutils-dir "fileutils-&fileutils-version;">
 
 <!ENTITY gcc-version "2.95.3">
 <!ENTITY gcc-depversion "2.95.3">
@@ -631,6 +642,8 @@
 <!ENTITY gcc-time-static "22 minutes">
 <!ENTITY gcc-compsize "148 MB">
 <!ENTITY gcc-time "22 minutes">
+<!ENTITY gcc-package "gcc-&gcc-version;.tar.bz2">
+<!ENTITY gcc-dir "gcc-&gcc-version;">
 
 <!ENTITY kernel-version "2.4.16">
 <!ENTITY kernel-depversion "2.4.8">
@@ -639,6 +652,8 @@
 <!ENTITY kernel-time-static "3 minutes">
 <!ENTITY kernel-compsize "Depends on options selected">
 <!ENTITY kernel-time "Depends on options selected">
+<!ENTITY kernel-package "linux-&kernel-version;.tar.bz2">
+<!ENTITY kernel-dir "linux">
 
 <!ENTITY grep-version "2.4.2">
 <!ENTITY grep-depversion "2.4.2">
@@ -647,6 +662,8 @@
 <!ENTITY grep-time-static "1 minute">
 <!ENTITY grep-compsize "3 MB">
 <!ENTITY grep-time "1 minute">
+<!ENTITY grep-package "grep-&grep-version;.tar.bz2">
+<!ENTITY grep-dir "grep-&grep-version;">
 
 <!ENTITY gzip-version "1.2.4a">
 <!ENTITY gzip-depversion "1.2.4a">
@@ -656,6 +673,8 @@
 <!ENTITY gzip-time-static "1 minute">
 <!ENTITY gzip-compsize "1 MB">
 <!ENTITY gzip-time "1 minute">
+<!ENTITY gzip-package "gzip-&gzip-version;.tar.bz2">
+<!ENTITY gzip-dir "gzip-&gzip-version;">
 
 <!ENTITY make-version "3.79.1">
 <!ENTITY make-depversion "3.79.1">
@@ -665,6 +684,8 @@
 <!ENTITY make-time-static "1 minute">
 <!ENTITY make-compsize "6 MB">
 <!ENTITY make-time "1 minute">
+<!ENTITY make-package "make-&make-version;.tar.bz2">
+<!ENTITY make-dir "make-&make-version;">
 
 <!ENTITY sed-version "3.02">
 <!ENTITY sed-depversion "3.02">
@@ -673,6 +694,8 @@
 <!ENTITY sed-time-static "1 minute">
 <!ENTITY sed-compsize "2 MB">
 <!ENTITY sed-time "1 minute">
+<!ENTITY sed-package "sed-&sed-version;.tar.bz2">
+<!ENTITY sed-dir "sed-&sed-version;">
 
 <!ENTITY sh-utils-version "2.0">
 <!ENTITY sh-utils-depversion "2.0">
@@ -682,6 +705,8 @@
 <!ENTITY sh-utils-time-static "2 minutes">
 <!ENTITY sh-utils-compsize "11 MB">
 <!ENTITY sh-utils-time "2 minutes">
+<!ENTITY sh-utils-package "sh-utils-&sh-utils-version;.tar.bz2">
+<!ENTITY sh-utils-dir "sh-utils-&sh-utils-version;">
 
 <!ENTITY tar-version "1.13">
 <!ENTITY tar-depversion "1.13">
@@ -691,6 +716,8 @@
 <!ENTITY tar-time-static "1 minute">
 <!ENTITY tar-compsize "7 MB">
 <!ENTITY tar-time "1 minute">
+<!ENTITY tar-package "tar-&tar-version;.tar.bz2">
+<!ENTITY tar-dir "tar-&tar-version;">
 
 <!ENTITY textutils-version "2.0">
 <!ENTITY textutils-depversion "2.0">
@@ -699,6 +726,8 @@
 <!ENTITY textutils-time-static "2 minutes">
 <!ENTITY textutils-compsize "15 MB">
 <!ENTITY textutils-time "1 minute">
+<!ENTITY textutils-package "textutils-&textutils-version;.tar.bz2">
+<!ENTITY textutils-dir "textutils-&textutils-version;">
 
 <!ENTITY mawk-version "1.3.3">
 <!ENTITY mawk-depversion "1.3.3">
@@ -707,6 +736,8 @@
 <!ENTITY mawk-time-static "1 minute">
 <!ENTITY mawk-compsize "2 MB">
 <!ENTITY mawk-time "1 minute">
+<!ENTITY mawk-package "mawk&mawk-version;.tar.bz2">
+<!ENTITY mawk-dir "mawk-&mawk-version;">
 
 <!ENTITY texinfo-version "4.0">
 <!ENTITY texinfo-depversion "4.0">
@@ -715,6 +746,8 @@
 <!ENTITY texinfo-time-static "1 minute">
 <!ENTITY texinfo-compsize "10 MB">
 <!ENTITY texinfo-time "1 minute">
+<!ENTITY texinfo-package "texinfo-&texinfo-version;.tar.bz2">
+<!ENTITY texinfo-dir "texinfo-&texinfo-version;">
 
 <!ENTITY patch-version "2.5.4">
 <!ENTITY patch-depversion "2.5.4">
@@ -723,12 +756,16 @@
 <!ENTITY patch-time-static "1 minute">
 <!ENTITY patch-compsize "2 MB">
 <!ENTITY patch-time "1 minute">
+<!ENTITY patch-package "patch-&patch-version;.tar.bz2">
+<!ENTITY patch-dir "patch-&patch-version;">
 
 <!ENTITY gettext-version "0.10.40">
 <!ENTITY gettext-depversion "0.10.39">
 <!ENTITY gettext-size "941 KB">
 <!ENTITY gettext-compsize "11MB">
 <!ENTITY gettext-time "1 minute">
+<!ENTITY gettext-package "gettext-&gettext-version;.tar.bz2">
+<!ENTITY gettext-dir "gettext-&gettext-version;">
 
 <!ENTITY glibc-version "2.2.4">
 <!ENTITY glibc-depversion "2.2.4">
@@ -736,12 +773,17 @@
 <!ENTITY glibc-threads-size "161 KB">
 <!ENTITY glibc-compsize "350 MB">
 <!ENTITY glibc-time "46 minutes">
+<!ENTITY glibc-package "glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-dir "glibc-&glibc-version;">
+<!ENTITY glibc-threads-package "glibc-linuxthreads-&glibc-version;.tar.bz2">
+<!ENTITY glibc-threads-dir "linuxthreads, linuxthreads_db">
 
 <!ENTITY makedev-version "1.4">
 <!ENTITY makedev-depversion "1.4">
 <!ENTITY makedev-size "7 KB">
 <!ENTITY makedev-compsize "57 KB">
 <!ENTITY makedev-time "1 minute">
+<!ENTITY makedev-package "MAKEDEV-&makedev-version;.tar.bz2">
 
 <!ENTITY man-pages-version "1.43">
 <!ENTITY man-pages-depversion "1.39">
@@ -749,12 +791,16 @@
 <!ENTITY man-pages-patch-size "2 KB">
 <!ENTITY man-pages-compsize "5 MB">
 <!ENTITY man-pages-time "1 minute">
+<!ENTITY man-pages-package "man-pages-&man-pages-version;.tar.bz2">
+<!ENTITY man-pages-dir "man-pages-&man-pages-version;">
 
 <!ENTITY ed-version "0.2">
 <!ENTITY ed-depversion "0.2">
 <!ENTITY ed-size "158 KB">
 <!ENTITY ed-compsize "2 MB">
 <!ENTITY ed-time "1 minute">
+<!ENTITY ed-package "ed-&ed-version;.tar.bz2">
+<!ENTITY ed-dir "ed-&ed-version;">
 
 <!ENTITY findutils-version "4.1">
 <!ENTITY findutils-depversion "4.1">
@@ -762,90 +808,120 @@
 <!ENTITY findutils-patch-size "1 KB">
 <!ENTITY findutils-compsize "3 MB">
 <!ENTITY findutils-time "1 minute">
+<!ENTITY findutils-package "findutils-&findutils-version;.tar.bz2">
+<!ENTITY findutils-dir "findutils-&findutils-version;">
 
 <!ENTITY ncurses-version "5.2">
 <!ENTITY ncurses-depversion "5.2">
 <!ENTITY ncurses-size "1,308 KB">
 <!ENTITY ncurses-compsize "29 MB">
 <!ENTITY ncurses-time "6 minutes">
+<!ENTITY ncurses-package "ncurses-&ncurses-version;.tar.bz2">
+<!ENTITY ncurses-dir "ncurses-&ncurses-version;">
 
 <!ENTITY vim-version "6.0">
 <!ENTITY vim-depversion "5.8">
 <!ENTITY vim-size "2,711 KB">
 <!ENTITY vim-compsize "15 MB">
 <!ENTITY vim-time "2 minutes">
+<!ENTITY vim-package "vim-&vim-version;-rt.tar.bz2, vim-&vim-version;-src.tar.bz2">
+<!ENTITY vim-dir "vim-&vim-version;">
 
 <!ENTITY bison-version "1.28">
 <!ENTITY bison-depversion "1.28">
 <!ENTITY bison-size "321 KB">
 <!ENTITY bison-compsize "3 MB">
 <!ENTITY bison-time "1 minute">
+<!ENTITY bison-package "bison-&bison-version;.tar.bz2">
+<!ENTITY bison-dir "bison-&bison-version;">
 
 <!ENTITY less-version "358">
 <!ENTITY less-depversion "358">
 <!ENTITY less-size "178 KB">
 <!ENTITY less-compsize "2 MB">
 <!ENTITY less-time "1 minute">
+<!ENTITY less-package "less-&less-version;.tar.bz2">
+<!ENTITY less-dir "less-&less-version;">
 
 <!ENTITY groff-version "1.17.2">
 <!ENTITY groff-depversion "1.17.2">
 <!ENTITY groff-size "1,214 KB">
 <!ENTITY groff-compsize "16 MB">
 <!ENTITY groff-time "2 minutes">
+<!ENTITY groff-package "groff-&groff-version;.tar.bz2">
+<!ENTITY groff-dir "groff-&groff-version;">
 
 <!ENTITY man-version "1.5j">
 <!ENTITY man-depversion "1.5i2">
 <!ENTITY man-size "167 KB">
 <!ENTITY man-compsize "1 MB">
 <!ENTITY man-time "1 minute">
+<!ENTITY man-package "man-&man-version;.tar.bz2">
+<!ENTITY man-dir "man-&man-version;">
 
 <!ENTITY perl-version "5.6.1">
 <!ENTITY perl-depversion "5.6.1">
 <!ENTITY perl-size "4,750 KB">
 <!ENTITY perl-compsize "35 MB">
 <!ENTITY perl-time "6 minutes">
+<!ENTITY perl-package "perl-&perl-version;.tar.bz2">
+<!ENTITY perl-dir "perl-&perl-version;">
 
 <!ENTITY m4-version "1.4">
 <!ENTITY m4-depversion "1.4">
 <!ENTITY m4-size "249 KB">
 <!ENTITY m4-compsize "3 MB">
 <!ENTITY m4-time "1 minute">
+<!ENTITY m4-package "m4-&m4-version;.tar.bz2">
+<!ENTITY m4-dir "m4-&m4-version;">
 
 <!ENTITY autoconf-version "2.52">
 <!ENTITY autoconf-depversion "2.52">
 <!ENTITY autoconf-size "618 KB">
 <!ENTITY autoconf-compsize "4 MB">
 <!ENTITY autoconf-time "1 minute">
+<!ENTITY autoconf-package "autoconf-&autoconf-version;.tar.bz2">
+<!ENTITY autoconf-dir "autoconf-&autoconf-version;">
 
 <!ENTITY automake-version "1.5">
 <!ENTITY automake-depversion "1.5">
 <!ENTITY automake-size "409 KB">
 <!ENTITY automake-compsize "3 MB">
 <!ENTITY automake-time "1 minute">
+<!ENTITY automake-package "automake-&automake-version;.tar.bz2">
+<!ENTITY automake-dir "automake-&automake-version;">
 
 <!ENTITY flex-version "2.5.4a">
 <!ENTITY flex-depversion "2.5.4a">
 <!ENTITY flex-size "278 KB">
 <!ENTITY flex-compsize "3MB">
 <!ENTITY flex-time "1 minute">
+<!ENTITY flex-package "flex-&flex-version;.tar.bz2">
+<!ENTITY flex-dir "flex-&flex-version;">
 
 <!ENTITY file-version "3.36">
 <!ENTITY file-depversion "3.36">
 <!ENTITY file-size "138 KB">
 <!ENTITY file-compsize "2 MB">
 <!ENTITY file-time "1 minute">
+<!ENTITY file-package "file-&file-version;.tar.bz2">
+<!ENTITY file-dir "file-&file-version;">
 
 <!ENTITY libtool-version "1.4.2">
 <!ENTITY libtool-depversion "1.4">
 <!ENTITY libtool-size "653 KB">
 <!ENTITY libtool-compsize "5 MB">
 <!ENTITY libtool-time "1 minute">
+<!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
+<!ENTITY libtool-dir "libtool-&libtool-version;">
 
 <!ENTITY bin86-version "0.16.0">
 <!ENTITY bin86-depversion "0.16.0">
 <!ENTITY bin86-size "113 KB">
 <!ENTITY bin86-compsize "1 MB">
 <!ENTITY bin86-time "1 minute">
+<!ENTITY bin86-package "bin86-&bin86-version;.tar.bz2">
+<!ENTITY bin86-dir "bin86-&bin86-version;">
 
 <!ENTITY kbd-version "1.06">
 <!ENTITY kbd-depversion "1.06">
@@ -854,84 +930,112 @@
 <!ENTITY kbd-patch-size "3 KB">
 <!ENTITY kbd-compsize "8 MB">
 <!ENTITY kbd-time "1 minute">
+<!ENTITY kbd-package "kbd-&kbd-version;.tar.bz2">
+<!ENTITY kbd-dir "kbd-&kbd-version;">
 
 <!ENTITY e2fsprogs-version "1.25">
 <!ENTITY e2fsprogs-depversion "1.22">
 <!ENTITY e2fsprogs-size "1,029 KB">
 <!ENTITY e2fsprogs-compsize "21 MB">
 <!ENTITY e2fsprogs-time "2 minutes">
+<!ENTITY e2fsprogs-package "e2fsprogs-&e2fsprogs-version;.tar.bz2">
+<!ENTITY e2fsprogs-dir "e2fsprogs-&e2fsprogs-version;">
 
 <!ENTITY reiserfs-version "3.x.0j">
 <!ENTITY reiserfs-depversion "N/A">
 <!ENTITY reiserfs-size "196 KB">
 <!ENTITY reiserfs-compsize "TBD">
 <!ENTITY reiserfs-time "TBD">
+<!ENTITY reiserfs-package "reiserfs-&reiserfs-version;.tar.bz2">
+<!ENTITY reiserfs-dir "reiserfs-&reiserfs-version;">
 
 <!ENTITY lilo-version "22.1">
 <!ENTITY lilo-depversion "21.7.5">
 <!ENTITY lilo-size "262 KB">
 <!ENTITY lilo-compsize "3 MB">
 <!ENTITY lilo-time "1 minute">
+<!ENTITY lilo-package "lilo-&lilo-version;.tar.bz2">
+<!ENTITY lilo-dir "lilo-&lilo-version;">
 
 <!ENTITY modutils-version "2.4.12">
 <!ENTITY modutils-depversion "2.4.7">
 <!ENTITY modutils-size "209 KB">
 <!ENTITY modutils-compsize "2 MB">
 <!ENTITY modutils-time "1 minute">
+<!ENTITY modutils-package "modutils-&modutils-version;.tar.bz2">
+<!ENTITY modutils-dir "modutils-&modutils-version;">
 
 <!ENTITY procinfo-version "18">
 <!ENTITY procinfo-depversion "18">
 <!ENTITY procinfo-size "22 KB">
 <!ENTITY procinfo-compsize "170 KB">
 <!ENTITY procinfo-time "1 minute">
+<!ENTITY procinfo-package "procinfo-&procinfo-version;.tar.bz2">
+<!ENTITY procinfo-dir "procinfo-&procinfo-version;">
 
 <!ENTITY procps-version "2.0.7">
 <!ENTITY procps-depversion "2.0.7">
 <!ENTITY procps-size "153 KB">
 <!ENTITY procps-compsize "2 MB">
 <!ENTITY procps-time "1 minute">
+<!ENTITY procps-package "procps-&procps-version;.tar.bz2">
+<!ENTITY procps-dir "procps-&procps-version;">
 
 <!ENTITY psmisc-version "20.1">
 <!ENTITY psmisc-depversion "20.1">
 <!ENTITY psmisc-size "51 KB">
 <!ENTITY psmisc-compsize "500 KB">
 <!ENTITY psmisc-time "1 minute">
+<!ENTITY psmisc-package "psmisc-&psmisc-version;.tar.bz2">
+<!ENTITY psmisc-dir "psmisc-&psmisc-version;">
 
 <!ENTITY shadow-version "20001016">
 <!ENTITY shadow-depversion "20001016">
 <!ENTITY shadow-size "551 KB">
 <!ENTITY shadow-compsize "6 MB">
 <!ENTITY shadow-time "3 minutes">
+<!ENTITY shadow-package "shadow-&shadow-version;.tar.bz2">
+<!ENTITY shadow-dir "shadow-&shadow-version;">
 
 <!ENTITY sysklogd-version "1.4.1">
 <!ENTITY sysklogd-depversion "1.4.1">
 <!ENTITY sysklogd-size "67 KB">
 <!ENTITY sysklogd-compsize "710 KB">
 <!ENTITY sysklogd-time "1 minute">
+<!ENTITY sysklogd-package "sysklogd-&sysklogd-version;.tar.bz2">
+<!ENTITY sysklogd-dir "sysklogd-&sysklogd-version;">
 
 <!ENTITY sysvinit-version "2.83">
 <!ENTITY sysvinit-depversion "2.82">
 <!ENTITY sysvinit-size "75 KB">
 <!ENTITY sysvinit-compsize "630 KB">
 <!ENTITY sysvinit-time "1 minute">
+<!ENTITY sysvinit-package "sysvinit-&sysvinit-version;.tar.bz2">
+<!ENTITY sysvinit-dir "sysvinit-&sysvinit-version;">
 
 <!ENTITY util-linux-version "2.11m">
 <!ENTITY util-linux-depversion "2.11h">
 <!ENTITY util-linux-size "995 KB">
 <!ENTITY util-linux-compsize "9 MB">
 <!ENTITY util-linux-time "1 minute">
+<!ENTITY util-linux-package "util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-dir "util-linux-&util-linux-version;">
 
 <!ENTITY netkit-base-version "0.17">
 <!ENTITY netkit-base-depversion "0.17">
 <!ENTITY netkit-base-size "49 KB">
 <!ENTITY netkit-base-compsize "1 MB">
 <!ENTITY netkit-base-time "1 minute">
+<!ENTITY netkit-base-package "netkit-base-&net-kit-version;.tar.bz2">
+<!ENTITY netkit-base-dir "netkit-base-&net-kit-version;">
 
 <!ENTITY net-tools-version "1.60">
 <!ENTITY net-tools-depversion "1.60">
 <!ENTITY net-tools-size "194 KB">
 <!ENTITY net-tools-compsize "5 MB">
 <!ENTITY net-tools-time "1 minute">
+<!ENTITY net-tools-package "net-tools-&net-tools-version;.tar.bz2">
+<!ENTITY net-tools-dir "net-tools-&net-tools-version;">
 
 ]>