diff --git a/target/crystal/build.sh b/target/crystal/build.sh
index 578c970da..17309bc78 100644
--- a/target/crystal/build.sh
+++ b/target/crystal/build.sh
@@ -25,19 +25,37 @@ if [ "$ROCKCFG_TARGET_CRYSTAL_BUILDADDONS" = 1 ]; then
 	done
 fi
 
+# do not include the linux source package on the install media
+rm build/${ROCKCFG_ID}/ROCK/pkgs_sel/linux2?-source-*.gem
+
+echo_status "Selecting info files ..."
+rm -rf build/${ROCKCFG_ID}/ROCK/info_sel
+mkdir -p build/${ROCKCFG_ID}/ROCK/info_sel
+cp -rl build/${ROCKCFG_ID}/var/adm/`
+	`{cksums,dependencies,descs,flists,md5sums,packages} \
+	build/${ROCKCFG_ID}/ROCK/info_sel/.
+
+grep -hr '^Package Name and Version:' \
+	build/${ROCKCFG_ID}/ROCK/info_sel/packages |
+awk '{ print $5 " " $6 "-" $7; }' |
+while read p v; do
+	if [ ! -f build/${ROCKCFG_ID}/ROCK/pkgs_sel/$p-$v.gem ]; then
+		echo build/${ROCKCFG_ID}/ROCK/info_sel/*/$p
+	fi
+done | xargs -r rm
+
 echo_status "Creating package database (everything) ..."
 admdir="build/${ROCKCFG_ID}/var/adm"
 create_package_db $admdir build/${ROCKCFG_ID}/ROCK/pkgs \
                   build/${ROCKCFG_ID}/ROCK/pkgs/packages.db
 
 echo_status "Creating package database (install media) ..."
-admdir="build/${ROCKCFG_ID}/var/adm"
+admdir="build/${ROCKCFG_ID}/ROCK/info_sel"
 create_package_db $admdir build/${ROCKCFG_ID}/ROCK/pkgs_sel \
                   build/${ROCKCFG_ID}/ROCK/pkgs_sel/packages.db
 
 echo_status "Creating isofs.txt file .."
 cat << EOT > build/${ROCKCFG_ID}/ROCK/isofs.txt
-DISK1	$admdir/cache/					${ROCKCFG_SHORTID}/info/cache/
 DISK1	$admdir/cksums/					${ROCKCFG_SHORTID}/info/cksums/
 DISK1	$admdir/dependencies/				${ROCKCFG_SHORTID}/info/dependencies/
 DISK1	$admdir/descs/					${ROCKCFG_SHORTID}/info/descs/