diff --git a/package/target-finish/2nd-stage/2nd-stage.conf b/package/target-finish/2nd-stage/2nd-stage.conf
index 376142fa1..9310dd2f1 100644
--- a/package/target-finish/2nd-stage/2nd-stage.conf
+++ b/package/target-finish/2nd-stage/2nd-stage.conf
@@ -62,6 +62,8 @@ if [ $packager = bize ] ; then
 fi
 
 disksdir="$root/ROCK/target-finish"
+# datadir is relative to $base.
+datadir="build/${ROCKCFG_ID}/ROCK/target-finish"
 
 mainfunction="second_stage_mainfunction"
 
@@ -271,4 +273,15 @@ done < <( find -type f | xargs md5sum | sort )
 echo "Creating 2nd_stage_small.tar.gz archive."
 tar -cvf- * | gzip -9 > ../2nd_stage_small.tar.gz ; cd ..
 
+echo "Creating ISO filesystem description."
+rm -rf 2nd-stage-isofs; mkdir -p 2nd-stage-isofs
+
+echo "Creating isofs directory.."
+ln 2nd_stage.tar.gz 2nd_stage_small.tar.gz 2nd-stage-isofs/
+
+echo "Creating isofs.txt file .."
+cat > $root/ROCK/isofs_2nd-stage.txt <<- EOT
+	DISK1	$datadir/2nd-stage-isofs/ ${ROCKCFG_SHORTID}/
+EOT
+
 }
diff --git a/package/target-finish/bootloader/bootloader.conf b/package/target-finish/bootloader/bootloader.conf
index fbd52a8e7..39d26c208 100644
--- a/package/target-finish/bootloader/bootloader.conf
+++ b/package/target-finish/bootloader/bootloader.conf
@@ -40,16 +40,9 @@ if [ -f $confdir/$arch/build.sh ]; then
 	. $confdir/$arch/build.sh
 fi
 
-echo "Creating ISO filesystem description."
-rm -rf isofs; mkdir -p isofs
-
-echo "Creating isofs directory.."
-ln 2nd_stage.tar.gz 2nd_stage_small.tar.gz isofs/
-
-echo "Creating isofs.txt file .."
+echo "Creating isofs_bootdisk.txt file .."
 cat > $root/ROCK/isofs_bootdisk.txt <<- EOT
 	DISK1	$datadir/boot/ boot/
-	DISK1	$datadir/isofs/ ${ROCKCFG_SHORTID}/
 EOT
 rm -rf "$tmpdir"
 }
diff --git a/package/target-finish/bootloader/bootloader.desc b/package/target-finish/bootloader/bootloader.desc
index 3809b0452..1de18d8eb 100644
--- a/package/target-finish/bootloader/bootloader.desc
+++ b/package/target-finish/bootloader/bootloader.desc
@@ -36,3 +36,8 @@
 [V] 1
 [P] O --X-----8- 996.200
 
+[O] syslinux_ver=2.11
+[O] mdlbl_ver=0.1a
+
+[D] 2125465292 syslinux-2.11.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/
+[D] 1570862055 mdlbl-0.1a.tar.bz2 http://www.rocklinux.net/people/clifford/MDLBL/
diff --git a/package/target-finish/bootloader/x86/build.sh b/package/target-finish/bootloader/x86/build.sh
index cd2033a06..04f22f483 100644
--- a/package/target-finish/bootloader/x86/build.sh
+++ b/package/target-finish/bootloader/x86/build.sh
@@ -1,10 +1,6 @@
 
 use_isolinux=1
-syslinux_ver="`sed -n 's,.*syslinux-\(.*\).tar.*,\1,p' \
-               $base/target/bootdisk/download.txt`"
 use_mdlbl=1
-mdlbl_ver="`sed -n 's,.*mdlbl-\(.*\).tar.*,\1,p' \
-            $base/target/bootdisk/download.txt`"
 
 cd $disksdir