diff --git a/misc/config/config-900-target-finish.in b/misc/config/config-900-target-finish.in
new file mode 100644
index 000000000..a2581a6ed
--- /dev/null
+++ b/misc/config/config-900-target-finish.in
@@ -0,0 +1,3 @@
+menu_begin MENU_PKG_TARGET_FINISH 'Target Finish Options'
+	include "package/target-finish/*/subconfig-target-finish.in"
+menu_end
diff --git a/package/target-finish/1st-stage/1st-stage.conf b/package/target-finish/1st-stage/1st-stage.conf
index 07ad08d81..bffb9b22a 100644
--- a/package/target-finish/1st-stage/1st-stage.conf
+++ b/package/target-finish/1st-stage/1st-stage.conf
@@ -4,44 +4,60 @@ mainfunction="first_stage_mainfunction"
 
 first_stage_mainfunction ()
 {
-
-if [ $ROCKCFG_BUILD_TARGET != 1 ] ; then
+if [ "$ROCK_BUILD_TARGET" != 1 ] ; then
 	echo "$xpkg can only be built with ./scripts/Build-Target!"
 	false
 fi
 
-build_rock="/ROCK"
-disksdir="$build_rock/$target"
-
-echo "Creating initrd data:"
-rm -rf $disksdir/initrd
-mkdir -p $disksdir/initrd/{dev,proc,sys,tmp,scsi,net,bin,etc,lib}
-cd $disksdir/initrd; ln -s bin sbin; ln -s . usr
+initrd_config="$ROCKCFG_1ST_STAGE_INITRD"
 
-# make mount not complain
-touch etc/fstab
+rootdir="$root"
+build_rock="$root/ROCK"
+#	disksdir="$build_rock/$target"
+disksdir="$build_rock/target"
+mkdir -p "$disksdir"
+targetdir="$disksdir/$initrd_config"
 
-rootdir="$disksdir/2nd_stage"
-targetdir="$disksdir/initrd"
 cross_compile=""
 if [ "$ROCKCFG_CROSSBUILD" = "1" ] ; then
-	cross_compile="`find ${base}/ROCK/tools.cross/ -name "*-readelf"`"
+	cross_compile="`find ${build_rock}/tools.cross/ -name "*-readelf"`"
 	cross_compile="${cross_compile##*/}"
 	cross_compile="${cross_compile%%readelf}"
 fi
 initrdfs="ext2fs"
 block_size=""
-ramdisk_size=12288
+
 
 case ${initrdfs} in
 	ext2fs|ext3fs|cramfs) 
-		initrd_img="${disksdir}/initrd.img"
+		initrd_img="${disksdir}/$initrd_config.img"
 		;;
 	ramfs)
-		initrd_img="${disksdir}/initrd.cpio"
+		initrd_img="${disksdir}/$initrd_config.cpio"
 		;;
 esac
 
+
+ #	kernel="$( basename "$( readlink -mn $rootdir/usr/src/linux )" )"
+kernel="$( grep "[ =]$ROCKCFG_PKG_LINUX_DEFAULT " $base/config/$config/packages | cut -f6 -d" " )-rock"
+# echo "kernel $kernel"
+
+echo "Creating initrd data:"
+rm -rf $disksdir/$initrd_config
+mkdir -p $disksdir/$initrd_config/{dev,proc,sys,tmp,scsi,net,bin,etc,lib}
+cd $disksdir/$initrd_config # ; ln -s bin sbin ; ln -s . usr
+
+# this copies a set of programs and the necessary libraries into a
+# chroot environment
+
+# make mount not complain
+# touch etc/fstab
+echo "/dev/root           /                     auto            defaults   0   0" > etc/fstab
+
+# supress udev uig/gid warnings
+cp -vp $base/build/$ROCKCFG_ID/etc/{passwd,group} etc/
+cp -vp $base/build/$ROCKCFG_ID/lib/libnss_files.so.* lib/
+
 echo "Creating some device nodes"
 mknod ${targetdir}/dev/ram0	b 1 0
 mknod ${targetdir}/dev/null	c 1 3
@@ -49,27 +65,18 @@ mknod ${targetdir}/dev/zero	c 1 5
 mknod ${targetdir}/dev/tty	c 5 0
 mknod ${targetdir}/dev/console	c 5 1
 
-# this copies a set of programs and the necessary libraries into a
-# chroot environment
-
-echo "Create checkisomd5 binary"
-cp -r ${base}/misc/isomd5sum ${base}/build/${ROCKCFG_ID}/
-cat >${base}/build/${ROCKCFG_ID}/compile_isomd5sum.sh <<EOF
-#!/bin/bash
-cd /isomd5sum
-make clean
-make CC=gcc
-EOF
-chmod +x ${base}/build/${ROCKCFG_ID}/compile_isomd5sum.sh
-chroot ${base}/build/${ROCKCFG_ID}/ /compile_isomd5sum.sh
-cp ${base}/build/${ROCKCFG_ID}/isomd5sum/checkisomd5 bin/
-rm -rf ${base}/build/${ROCKCFG_ID}/compile_isomd5sum.sh ${base}/build/${ROCKCFG_ID}/isomd5sum
-echo "Copying and adjusting linuxrc scipt"
-cp $confdir/linuxrc.sh sbin/init
-chmod +x sbin/init
-sed -i -e "s,^STAGE_2_BIG_IMAGE=\"2nd_stage.tar.gz\"$,STAGE_2_BIG_IMAGE=\"${ROCKCFG_SHORTID}/2nd_stage.tar.gz\"," \
-       -e "s,^STAGE_2_SMALL_IMAGE=\"2nd_stage_small.tar.gz\"$,STAGE_2_SMALL_IMAGE=\"${ROCKCFG_SHORTID}/2nd_stage_small.tar.gz\"," \
-       sbin/init
+# echo "Create checkisomd5 binary"
+# cp -r ${base}/misc/isomd5sum ${base}/build/${ROCKCFG_ID}/
+# cat >${base}/build/${ROCKCFG_ID}/compile_isomd5sum.sh <<EOF
+# #!/bin/bash
+# cd /isomd5sum
+# make clean
+# make CC=gcc
+# EOF
+# chmod +x ${base}/build/${ROCKCFG_ID}/compile_isomd5sum.sh
+# chroot ${base}/build/${ROCKCFG_ID}/ /compile_isomd5sum.sh
+# cp ${base}/build/${ROCKCFG_ID}/isomd5sum/checkisomd5 bin/
+# rm -rf ${base}/build/${ROCKCFG_ID}/compile_isomd5sum.sh ${base}/build/${ROCKCFG_ID}/isomd5sum
 
 libdirs="${rootdir}/lib `sed -e"s,^\(.*\),${rootdir}\1," ${rootdir}/etc/ld.so.conf | tr '\n' ' '`"
 
@@ -85,9 +92,13 @@ needed_libs() {
 }
 
 libs="${libs} `needed_libs bin/checkisomd5`"
+# /usr/lib/libgcc_s.so.1 is required for ARM, but not auto-detected
+if [ "$ROCKCFG_ARCH" = arm ] ; then
+	libs="${libs} /usr/lib/libgcc_s.so.1"
+fi
 
 echo "Copying other files ... "
-for x in $confdir/initrd/initrd_* ; do
+for x in $confdir/$initrd_config/initrd_* ; do
 	[ -f ${x} ] || continue
 	while read file target ; do
 		file="${rootdir}/${file}"
@@ -104,18 +115,22 @@ for x in $confdir/initrd/initrd_* ; do
 				mkdir -p ${tfile%/*}
 			fi
 
-# 			if [ -b ${f} -o -c ${f} -o -p ${f} -o -L ${f} ] ; then
-				cp -a ${f} ${tfile}
-# 			else
-# 				cp ${f} ${tfile}
-# 			fi
+			cp -dp "${f}" "${tfile}"
+			ls -l "$tfile"
 
-			file -L ${f} | grep -q ELF || continue
+			file -L "${f}" | grep -q ELF || continue
 			libs="${libs} `needed_libs ${f}`"
 		done < <( find "${file}" )
-	done < ${x}
+	done < <( grep -v "^[ 	]*#" ${x} )
 done
 
+echo "Copying and adjusting linuxrc scipt"
+cp -dp $confdir/linuxrc.sh sbin/init
+chmod +x sbin/init
+sed -i -e "s,^STAGE_2_BIG_IMAGE=\"2nd_stage.tar.gz\"$,STAGE_2_BIG_IMAGE=\"${ROCKCFG_SHORTID}/2nd_stage.tar.gz\"," \
+-e "s,^STAGE_2_SMALL_IMAGE=\"2nd_stage_small.tar.gz\"$,STAGE_2_SMALL_IMAGE=\"${ROCKCFG_SHORTID}/2nd_stage_small.tar.gz\"," \
+sbin/init
+
 for x in modprobe.static modprobe.static.old insmod.static insmod.static.old ; do
 	if [ -f ../2nd_stage/sbin/${x/.static/} ]; then
 		rm -f bin/${x/.static/}
@@ -128,26 +143,51 @@ for x in modprobe.static modprobe.static.old insmod.static insmod.static.old ; d
 	fi
 done
 
+add_module_to_initrd() {
+	# adds a module and all it's dependencies to the initrd
+	module_name="${1}"
+	parameter="${2}"
+	module_name=${module_name/.ko/} # just in case, shouldn't be
+
+	for dependant_module in `get_module_dependencies ${module_name} | sort | uniq` ; do
+		module="`find ${rootdir}/lib/modules/${kernel} -name "${dependant_module}.o" -o -name "${dependant_module}.ko"`"
+		[ -f "${targetdir}/${module}" ] && return # skip dupes
+		echo "Adding ${module}."
+		mkdir -p ${targetdir}/${module%/*}
+		cp ${module} ${targetdir}/${module}
+	done
+
+	echo "/sbin/modprobe ${module_name} ${parameter}" >> ${targetdir}/etc/conf/kernel
+}
+
 echo "Copy scsi and network kernel modules."
 tmptar="`mktemp`" ; tar cfT ${tmptar} /dev/null
 
-for x in $( cd ../2nd_stage ; ls -d lib/modules/*/kernel/drivers/{scsi,net} )
+for x in $( cd ${rootdir} ; echo lib/modules/*/kernel/drivers/{scsi,net} )
 do
-	[ -e "../2nd_stage/${x}" ] && tar rf ${tmptar} -C ../2nd_stage ${x}
+	[ -e "${rootdir}/${x}" ] && tar rf ${tmptar} -C ${rootdir} ${x}
 done
 tar xf ${tmptar} ; rm -f ${tmptar}
 
+rm -f lib/modules/[0-9]*/kernel/drivers/scsi/{st,scsi_debug}.{o,ko}
+rm -f lib/modules/[0-9]*/kernel/drivers/net/{dummy,ppp*}.{o,ko}
+
 [ -e lib/modules ] && find lib/modules -type f -exec $STRIP --strip-debug {} \;
 
-for x in ../2nd_stage/lib/modules/*/modules.{dep,pcimap,isapnpmap} ; do
-	cp $x ${x#../2nd_stage/} || echo "not found: $x" ;
-done
+depmod -b ${targetdir} -F ${rootdir}/boot/System.map -v ${kernel}
+# for x in ${rootdir}/lib/modules/*/modules.{dep,pcimap,isapnpmap} ; do
+# 	cp $x ${x#*$rootdir/} || echo "not found: $x" ;
+# done
 
 for x in lib/modules/*/kernel/drivers/{scsi,net}; do
 	[ -d $x ] && ln -s ${x#lib/modules/} lib/modules/
 done
-rm -f lib/modules/[0-9]*/kernel/drivers/scsi/{st,scsi_debug}.{o,ko}
-rm -f lib/modules/[0-9]*/kernel/drivers/net/{dummy,ppp*}.{o,ko}
+
+if [ -e ${rootdir}/lib64 ] ; then
+	# mixed 32/64-bit libraries are not supported
+	echo "Creating /lib64 -> /lib symlink ... "
+	ln -s lib $targetdir/lib64
+fi
 
 echo "Copying required libraries ... "
 while [ -n "${libs}" ] ; do
@@ -156,7 +196,8 @@ while [ -n "${libs}" ] ; do
 	for x in ${oldlibs} ; do
 		[ -e ${targetdir}/${x} ] && continue
 		mkdir -p ${targetdir}/${x%/*}
-		cp ${rootdir}/${x} ${targetdir}/${x}
+		cp -p ${rootdir}/${x} ${targetdir}/${x}
+		ls -l ${rootdir}/${x} ${targetdir}/${x}
 		file -L ${rootdir}/${x} | grep -q ELF || continue
 		for y in `needed_libs ${rootdir}/${x}` ; do
 			[ ! -e "${targetdir}/${y}" ] && libs="${libs} ${y}"
@@ -178,22 +219,21 @@ done < <( find ${targetdir} -type f | xargs md5sum | sort )
 
 cd ..
 
+#	ramdisk_size=8192
+# ramdisk_size="$(( $( du -s $targetdir --block-size=1K | cut -f1 ) + $( du -s $targetdir -block-size=1K | cut -f1 ) / 10 ))"
+# [ $ramdisk_size -lt 8192 ] && ramdisk_size=8192
 echo "Creating initrd filesystem image (${initrdfs}): "
 case "${initrdfs}" in
 cramfs)
 	[ "${block_size}" == "" ] && block_size=4096
 	mkfs.cramfs -b ${block_size} ${targetdir} ${initrd_img}
 	;;
-ramfs)
-#	cp -a ${targetdir}/{linuxrc,init}
-	( cd ${targetdir} ; find | cpio -o -c > ${initrd_img} ; )
-	;;	
 ext2fs|ext3fs)
 	[ "${block_size}" == "" ] && block_size=1024
-	block_count=$(( ( 1024 * ${ramdisk_size} ) / ${block_size} ))
-
-	echo "Creating temporary files."
+	block_count="$(( ( $( du -s $targetdir --block-size=$block_size | cut -f1 ) * 11 ) / 10 ))"
+	echo "block_size=$block_size block_count=$block_count"
 	tmpdir=`mktemp -d` ; mkdir -p ${tmpdir}
+	echo "Creating temporary files in $tmpdir."
 	dd if=/dev/zero of=${initrd_img} bs=${block_size} count=${block_count} &> /dev/null
 	tmpdev="`losetup -f 2>/dev/null`"
 	if [ -z "${tmpdev}" ] ; then
@@ -211,12 +251,12 @@ ext2fs|ext3fs)
 	losetup "${tmpdev}" ${initrd_img}
 
 	echo "Writing initrd image file."
-	mkfs.${initrdfs:0:4} -b ${block_size} -m 0 -N 360 -q ${tmpdev} &> /dev/null
-	mount -t ${initrdfs:0:4} ${tmpdev} ${tmpdir}
+	mkfs.${initrdfs:0:4} -b ${block_size} -m 0 -q ${tmpdev} &> /dev/null
+	mount -n -t ${initrdfs:0:4} ${tmpdev} ${tmpdir}
 	rmdir ${tmpdir}/lost+found/
 	cp -a ${targetdir}/* ${tmpdir}
-	umount ${tmpdir}
- 
+	umount -n ${tmpdir}
+
 	echo "Removing temporary files."
 	losetup -d ${tmpdev}
 	rm -rf ${tmpdir}
diff --git a/package/target-finish/1st-stage/1st-stage.desc b/package/target-finish/1st-stage/1st-stage.desc
index c56cc2bad..e8025f779 100644
--- a/package/target-finish/1st-stage/1st-stage.desc
+++ b/package/target-finish/1st-stage/1st-stage.desc
@@ -33,5 +33,5 @@
 [L] GPL
 [S] Stable
 [V] 1
-[P] O --------8- 195.200
+[P] O -X------8- 995.200
 
diff --git a/package/target-finish/1st-stage/initrd-big/initrd_bootdisk b/package/target-finish/1st-stage/initrd-big/initrd_bootdisk
new file mode 100644
index 000000000..8cce998d5
--- /dev/null
+++ b/package/target-finish/1st-stage/initrd-big/initrd_bootdisk
@@ -0,0 +1,22 @@
+/etc /etc
+/bin /bin
+# /boot/grub /boot/grub
+/sbin /sbin
+/lib/udev /lib/udev
+/lib/modules /lib/modules
+/usr/bin /usr/bin
+/usr/sbin /usr/sbin
+/usr/share/pci.ids /usr/share/pci.ids
+# /usr/share/terminfo /usr/share/terminfo
+# /usr/share/zoneinfo /usr/share/zoneinfo
+# /var/adm/cksums /var/adm/cksums
+# /var/adm/conflicts /var/adm/conflicts
+# /var/adm/dependencies /var/adm/dependencies
+# /var/adm/descs /var/adm/descs
+# /var/adm/flists /var/adm/flists
+# /var/adm/md5sums /var/adm/md5sums
+# /var/adm/packages /var/adm/packages
+# /var/adm/parse-config /var/adm/parse-config
+# /var/adm/postinstall /var/adm/postinstall
+# /var/adm/provides /var/adm/provides
+# /var/adm/requires /var/adm/requires
diff --git a/package/target-finish/1st-stage/linuxrc.sh b/package/target-finish/1st-stage/linuxrc.sh
index 6535d5503..9c496db23 100644
--- a/package/target-finish/1st-stage/linuxrc.sh
+++ b/package/target-finish/1st-stage/linuxrc.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+
 STAGE_2_BIG_IMAGE="2nd_stage.tar.gz"
 STAGE_2_SMALL_IMAGE="2nd_stage_small.tar.gz"
 STAGE_2_COMPRESS_ARG="--use-compress-program=gzip"
diff --git a/package/target-finish/1st-stage/subconfig-target-finish.in b/package/target-finish/1st-stage/subconfig-target-finish.in
new file mode 100644
index 000000000..e83a6c413
--- /dev/null
+++ b/package/target-finish/1st-stage/subconfig-target-finish.in
@@ -0,0 +1,3 @@
+menu_begin MENU_1ST_STAGE "1st Stage Options"
+	choice ROCKCFG_PKG_1ST_STAGE_INITRD initrd initrd "Use initrd config as 1st stage" initrd-big "Use initrd-big config as 1st stage"
+menu_end
diff --git a/package/target-finish/2nd-stage/2nd-stage.conf b/package/target-finish/2nd-stage/2nd-stage.conf
index 26e436d26..32ab8d181 100644
--- a/package/target-finish/2nd-stage/2nd-stage.conf
+++ b/package/target-finish/2nd-stage/2nd-stage.conf
@@ -3,6 +3,7 @@
 package_map="       +00-dirtree
 -automake17         -automake18         -automake19         -gcc2
 -gcc33              -gcc34              -gcc40              -gcc41
+-gcc42
 -gmp                -mpfr               -rockinitrd         +stone
 -linux24-source     -linux26-header     -linux24            +udev
 -linux26-source     -linux26-header     -linux26            -postinstall
@@ -60,11 +61,10 @@ if [ $packager = bize ] ; then
 	progs="$progs bzip2 md5sum"
 fi
 
-mainfunction="2nd_stage_mainfunction"
+mainfunction="second_stage_mainfunction"
 
-2nd_stage_mainfunction ()
+second_stage_mainfunction ()
 {
-
 if [ "$ROCK_BUILD_TARGET" != 1 ] ; then
 	echo "$xpkg can only be built with ./scripts/Build-Target!"
 	false
@@ -72,8 +72,8 @@ fi
 
 # taropt="--use-compress-program=bzip2 -xf"
 
-build_rock="/ROCK"
-disksdir="$build_rock/$target"
+build_rock="$root/ROCK"
+disksdir="$build_rock/target"
 
 echo "Creating 2nd stage filesystem:"
 
@@ -136,8 +136,8 @@ mv boot/* ../boot/
 #
 echo "Remove the stuff we do not need ..."
 rm -rf home usr/{local,doc,man,info,games,share}
-rm -rf var/adm/* var/games var/adm var/mail var/opt
-rm -rf usr/{include,src} usr/*-linux-gnu {,usr/}lib/*.{a,la,o}
+rm -rf var/{adm,games,mail,opt}
+rm -rf usr/{include,src,*-linux-gnu} {,usr/}lib/*.{a,la,o}
 for x in usr/lib/*/ ; do rm -rf ${x%/} ; done
 #
 echo "Installing some terminfo databases ..."
diff --git a/package/target-finish/2nd-stage/2nd-stage.desc b/package/target-finish/2nd-stage/2nd-stage.desc
index 296c74489..61d09dce0 100644
--- a/package/target-finish/2nd-stage/2nd-stage.desc
+++ b/package/target-finish/2nd-stage/2nd-stage.desc
@@ -34,5 +34,5 @@
 [L] GPL
 [S] Stable
 [V] 1
-[P] O --------8- 194.200
+[P] O -X------8- 994.200
 
diff --git a/package/target-finish/bootloader/bootloader.conf b/package/target-finish/bootloader/bootloader.conf
index 16d5e234a..cbca0746a 100644
--- a/package/target-finish/bootloader/bootloader.conf
+++ b/package/target-finish/bootloader/bootloader.conf
@@ -10,7 +10,21 @@ if [ "$ROCK_BUILD_TARGET" != 1 ] ; then
 fi
 
 build_rock="$xroot/ROCK"
-disksdir="$build_rock/$target"
+disksdir="$build_rock/target"
+
+tmpdir="$( mktemp -d )" ; mkdir -p "$tmpdir"
+pkg_suffix=.no_binpkg
+if [ "$ROCKCFG_CREATE_TARBZ2" == 1 ] ; then
+	pkg_suffix='.tar.bz2'
+	install_pkg() { eval tar $taropt $1 || true ; }
+elif [ "$ROCKCFG_CREATE_GEM" == 1 ] ; then
+	pkg_suffix='.gem'
+	install_pkg() { eval mine -if -R . $1 || true ; }
+fi
+
+if [ "$ROCKCFG_PKGFILE_VER" == 1 ] ; then
+	pkg_suffix='-$pkg_ver-$pkg_extraver'$pkg_suffix
+fi
 
 if [ -f $confdir/$arch/build.sh ]; then
 	. $confdir/$arch/build.sh
@@ -24,7 +38,8 @@ ln 2nd_stage.tar.gz 2nd_stage_small.tar.gz isofs/
 ln *.img initrd.gz isofs/ 2>/dev/null || true # might not exist on some architectures
 
 echo "Creating isofs.txt file .."
-echo "DISK1	build/${ROCKCFG_ID}/ROCK/$target/isofs/ `
+echo "DISK1	build/${ROCKCFG_ID}/ROCK/target/isofs/ `
 	`${ROCKCFG_SHORTID}/" > $build_rock/isofs_bootdisk.txt
 
+rm -rf "$tmpdir"
 }
diff --git a/package/target-finish/bootloader/bootloader.desc b/package/target-finish/bootloader/bootloader.desc
index 060801e44..5629af79d 100644
--- a/package/target-finish/bootloader/bootloader.desc
+++ b/package/target-finish/bootloader/bootloader.desc
@@ -33,5 +33,5 @@
 [L] GPL
 [S] Stable
 [V] 1
-[P] O --------8- 196.200
+[P] O -X------8- 996.200
 
diff --git a/package/target-finish/bootloader/powerpc/build.sh b/package/target-finish/bootloader/powerpc/build.sh
index 241ac23fd..193ea9d02 100644
--- a/package/target-finish/bootloader/powerpc/build.sh
+++ b/package/target-finish/bootloader/powerpc/build.sh
@@ -36,7 +36,7 @@ then
 	echo "Copy more config files."
 	cp -v $confdir/powerpc/mapping .
 	#
-	datadir="build/${ROCKCFG_ID}/ROCK/$target"
+	datadir="build/${ROCKCFG_ID}/ROCK/target"
 	cat > $xroot/ROCK/isofs_arch.txt <<- EOT
 		BOOT	-hfs -part -map $datadir/mapping -hfs-volid "ROCK_Linux_CD"
 		BOOTx	-hfs-bless boot -sysid PPC -l -L -r -T -chrp-boot
diff --git a/package/target-finish/bootloader/sparc/build.sh b/package/target-finish/bootloader/sparc/build.sh
index 4e29346d3..49bb57df1 100644
--- a/package/target-finish/bootloader/sparc/build.sh
+++ b/package/target-finish/bootloader/sparc/build.sh
@@ -8,20 +8,26 @@ echo "Creating silo setup:"
 #
 echo "Extracting silo boot loader images."
 mkdir -p boot
-tar $taropt $base/build/${ROCKCFG_ID}/ROCK/pkgs/silo.tar.bz2 \
-    boot/second.b -O > boot/second.b
+pkg_ver="$( grep " silo " $base/config/$config/packages | cut -f6 -d" " )"
+pkg_extraver="$( grep " silo " $base/config/$config/packages | cut -f7 -d" " )"
+eval x=$build_rock/pkgs/silo$pkg_suffix
+echo $x ver $pkg_ver extraver $pkg_extraver
+if [[ "$pkg_suffix" == *gem ]] ; then
+	mine -k pkg_tarbz2 $x > $tmpdir/silo.tar.bz2
+	x=$tmpdir/silo.tar.bz2
+fi
+tar -O $taropt $x boot/second.b > boot/second.b
 #
 echo "Creating silo config file."
 cp -v $confdir/sparc/{silo.conf,boot.msg,help1.txt} \
   boot
 #
 echo "Moving image (initrd) to boot directory."
-mv -v initrd.gz boot/
+mv -v $ROCKCFG_PKG_1ST_STAGE_INITRD.gz boot/
 #
 buildroot="build/${ROCKCFG_ID}"
-datadir="build/${ROCKCFG_ID}/ROCK/$target"
+datadir="build/${ROCKCFG_ID}/ROCK/target"
 cat > $xroot/ROCK/isofs_arch.txt <<- EOT
 	BOOT	-G $buildroot/boot/isofs.b -B ...
 	DISK1	$datadir/boot/ boot/
 EOT
-
diff --git a/package/target-finish/bootloader/x86/build.sh b/package/target-finish/bootloader/x86/build.sh
index d60c47f66..4dc38a196 100644
--- a/package/target-finish/bootloader/x86/build.sh
+++ b/package/target-finish/bootloader/x86/build.sh
@@ -10,31 +10,31 @@ cd $disksdir
 
 echo "Creating lilo config and cleaning boot directory:"
 cp $confdir/x86/lilo-* boot/
-rm -rfv boot/*-rock boot/grub boot/System.map boot/kconfig boot/*.24**
+rm -rfv boot/{grub,System.map*,kconfig*}
 
 echo "Creating floppy disk images:"
 cp $confdir/x86/makeimages.sh .
 chmod +x makeimages.sh
 
-if [ $use_mdlbl -eq 1 ]
-then
-	tar $taropt $base/download/mirror/m/mdlbl-$mdlbl_ver.tar.bz2
-	cd mdlbl-$mdlbl_ver
-	cp ../boot/vmlinuz .; cp ../initrd.gz initrd; ./makedisks.sh
-	for x in disk*.img; do mv $x ../floppy${x#disk}; done; cd ..
-	du -sh floppy*.img | while read x; do echo $x; done
-else
-	tmpfile=`mktemp -p $PWD`
-	if sh ./makeimages.sh &> $tmpfile; then
-		cat $tmpfile | while read x; do echo "$x"; done
-	else
-		cat $tmpfile | while read x; do echo "$x"; done
-	fi
-	rm -f $tmpfile
-	cat > $xroot/ROCK/isofs_arch.txt <<- EOT
-		BOOT	-b ${ROCKCFG_SHORTID}/boot_288.img -c ${ROCKCFG_SHORTID}/boot.catalog
-	EOT
-fi
+# if [ $use_mdlbl -eq 1 ]
+# then
+# 	tar $taropt $base/download/mirror/m/mdlbl-$mdlbl_ver.tar.bz2
+# 	cd mdlbl-$mdlbl_ver
+# 	cp ../boot/vmlinuz .; cp ../initrd.gz initrd; ./makedisks.sh
+# 	for x in disk*.img; do mv $x ../floppy${x#disk}; done; cd ..
+# 	du -sh floppy*.img | while read x; do echo $x; done
+# else
+# 	tmpfile=`mktemp -p $PWD`
+# 	if sh ./makeimages.sh &> $tmpfile; then
+# 		cat $tmpfile | while read x; do echo "$x"; done
+# 	else
+# 		cat $tmpfile | while read x; do echo "$x"; done
+# 	fi
+# 	rm -f $tmpfile
+# 	cat > $xroot/ROCK/isofs_arch.txt <<- EOT
+# 		BOOT	-b ${ROCKCFG_SHORTID}/boot_288.img -c ${ROCKCFG_SHORTID}/boot.catalog
+# 	EOT
+# fi
 
 if [ $use_isolinux -eq 1 ]
 then
@@ -56,7 +56,7 @@ then
 	cat > $xroot/ROCK/isofs_arch.txt <<- EOT
 		BOOT	-b isolinux/isolinux.bin -c isolinux/boot.catalog
 		BOOTx	-no-emul-boot -boot-load-size 4 -boot-info-table
-		DISK1	build/${ROCKCFG_ID}/ROCK/$target/isolinux/ isolinux/
+		DISK1	build/${ROCKCFG_ID}/ROCK/target/isolinux/ isolinux/
 	EOT
 fi
 
diff --git a/package/target-finish/isofs/isofs.conf b/package/target-finish/isofs/isofs.conf
index 6c5420502..36e9b91d2 100644
--- a/package/target-finish/isofs/isofs.conf
+++ b/package/target-finish/isofs/isofs.conf
@@ -10,8 +10,8 @@ packagedb_mainfunction ()
 	fi
 
 	echo "Creating isofs.txt file .."
-	admdir="build/${ROCKCFG_ID}/var/adm"
-	cat << EOT > $xroot/ROCK/isofs_generic.txt
+	admdir="$xroot/var/adm"
+	cat > $xroot/ROCK/isofs_generic.txt <<- EOT
 DISK1	$admdir/cache/					${ROCKCFG_SHORTID}/info/cache/
 DISK1	$admdir/cksums/					${ROCKCFG_SHORTID}/info/cksums/
 DISK1	$admdir/dependencies/				${ROCKCFG_SHORTID}/info/dependencies/
@@ -21,5 +21,7 @@ DISK1	$admdir/md5sums/				${ROCKCFG_SHORTID}/info/md5sums/
 DISK1	$admdir/packages/				${ROCKCFG_SHORTID}/info/packages/
 EOT
 
+	ls -l $xroot/ROCK/isofs_*.txt
+	cat $xroot/ROCK/isofs_*.txt
 	cat $xroot/ROCK/isofs_*.txt > $xroot/ROCK/isofs.txt
 }
diff --git a/package/target-finish/isofs/isofs.desc b/package/target-finish/isofs/isofs.desc
index 5361cd478..f7734d723 100644
--- a/package/target-finish/isofs/isofs.desc
+++ b/package/target-finish/isofs/isofs.desc
@@ -34,5 +34,5 @@
 [L] GPL
 [S] Stable
 [V] 1
-[P] O --------8- 198.200
+[P] O -X------8- 998.200
 
diff --git a/package/target-finish/packagedb/packagedb.conf b/package/target-finish/packagedb/packagedb.conf
index eeeb5fa28..d21852180 100644
--- a/package/target-finish/packagedb/packagedb.conf
+++ b/package/target-finish/packagedb/packagedb.conf
@@ -13,7 +13,7 @@ packagedb_mainfunction ()
 	admdir="$xroot/var/adm"
 	create_package_db $admdir $xroot/ROCK/pkgs
 
-	cat << EOT >> $xroot/ROCK/isofs_packages.txt
+	cat > $xroot/ROCK/isofs_packages.txt <<- EOT
 EVERY	build/${ROCKCFG_ID}/ROCK/pkgs/packages.db	${ROCKCFG_SHORTID}/pkgs/packages.db
 SPLIT	build/${ROCKCFG_ID}/ROCK/pkgs/			${ROCKCFG_SHORTID}/pkgs/
 EOT
diff --git a/package/target-finish/packagedb/packagedb.desc b/package/target-finish/packagedb/packagedb.desc
index 17dc2b7dd..1fbd3b743 100644
--- a/package/target-finish/packagedb/packagedb.desc
+++ b/package/target-finish/packagedb/packagedb.desc
@@ -33,5 +33,5 @@
 [L] GPL
 [S] Stable
 [V] 1
-[P] O --------8- 197.200
+[P] O -X------8- 997.200