diff --git a/target/livecd/default.pkgmap b/target/livecd/default.pkgmap
index 62fcb628d..03845dbcd 100644
--- a/target/livecd/default.pkgmap
+++ b/target/livecd/default.pkgmap
@@ -36,10 +36,10 @@ package_map='
 -flex
 +fbset
 +gawk
-+gcc3
++gcc
 -gettext
 +genromfs
-+glibc23
++glibc
 +grep
 -groff
 +grub
@@ -59,12 +59,12 @@ package_map='
 +libpcap
 +libtiff
 +libungif
--linux24
 -linux26
--linux24-header
+-linux24
 -linux26-header
--linux24-src
+-linux24-header
 -linux26-src
+-linux24-src
 +lrzsz
 -m4
 -make
diff --git a/target/livecd/default.pkgsel b/target/livecd/default.pkgsel
index 8792c687f..57411d64e 100644
--- a/target/livecd/default.pkgsel
+++ b/target/livecd/default.pkgsel
@@ -63,10 +63,10 @@ pkgfilter sed '
 / findutils /                   { p; d; };
 / flex /                        { p; d; };
 / gawk /                        { p; d; };
-/ gcc3 /                        { p; d; };
+/ gcc /                        { p; d; };
 / gettext /                     { p; d; };
 / genromfs /                    { p; d; };
-/ glibc23 /                     { p; d; };
+/ glibc /                     { p; d; };
 / grep /                        { p; d; };
 / groff /                       { p; d; };
 / grub /                        { p; d; };
@@ -86,10 +86,9 @@ pkgfilter sed '
 / libpcap /                     { p; d; };
 / libtiff /                     { p; d; };
 / libungif /                    { p; d; };
-/ linux24 /                     { p; d; };
-/ linux26 /                     { p; d; };
-/ linux.*-header /              { p; d; };
-/ linux.*-src /                 { p; d; };
+/ linux /                       { p; d; };
+/ linux-header /                { p; d; };
+/ linux-src /                   { p; d; };
 / lrzsz /                       { p; d; };
 / m4 /                          { p; d; };
 / make /                        { p; d; };
@@ -198,9 +197,7 @@ pkgfilter sed '
 / libsdl_image /                { p; d; };
 / nasm /                        { p; d; };
 / readline /                    { p; d; };
-/ bdb33 /                       { p; d; };
-/ bdb41 /                       { p; d; };
-/ bdb42 /                       { p; d; };
+/ bdb /                         { p; d; };
 / gdbm /                        { p; d; };
 / gmp /                         { p; d; };
 / tcltk /                       { p; d; };
diff --git a/target/livecd/x86/build.sh b/target/livecd/x86/build.sh
index 34f63d1c0..522c67b72 100644
--- a/target/livecd/x86/build.sh
+++ b/target/livecd/x86/build.sh
@@ -9,7 +9,7 @@ echo_header "Creating isolinux setup:"
 echo_status "Extracting isolinux boot loader."
 mkdir -p isolinux
 tar --use-compress-program=bzip2 \
-    -xf $base/download/livecd/syslinux-$syslinux_ver.tar.bz2 \
+    -xf $base/download/mirror/s/syslinux-$syslinux_ver.tar.bz2 \
     syslinux-$syslinux_ver/isolinux.bin -O > isolinux/isolinux.bin
 #
 echo_status "Creating isolinux config file."