diff --git a/misc/pkgsel/benchmark.in b/misc/pkgsel/benchmark.in
index 75ea47a27..cffb398a5 100644
--- a/misc/pkgsel/benchmark.in
+++ b/misc/pkgsel/benchmark.in
@@ -49,9 +49,9 @@ pkgfilter sed '
 / findutils /                   { p; d; };
 / flex /                        { p; d; };
 / gawk /                        { p; d; };
-/ gcc3 /                        { p; d; };
+/ gcc /                         { p; d; };
 / gettext /                     { p; d; };
-/ glibc23 /                     { p; d; };
+/ glibc /                       { p; d; };
 / grep /                        { p; d; };
 / groff /                       { p; d; };
 / gzip /                        { p; d; };
@@ -63,8 +63,7 @@ pkgfilter sed '
 / libpng /                      { p; d; };
 / libtiff /                     { p; d; };
 / libungif /                    { p; d; };
-/ linux.* /                     { p; d; };
-/ linux.*-header /              { p; d; };
+/ linux /                       { p; d; };
 / m4 /                          { p; d; };
 / make /                        { p; d; };
 / man /                         { p; d; };
diff --git a/scripts/Build-Target b/scripts/Build-Target
index 43358fd32..7fb464c5d 100755
--- a/scripts/Build-Target
+++ b/scripts/Build-Target
@@ -211,11 +211,15 @@ fi
 
 	local pkglst=`mktemp` errors=0; rm -f src/invalid-files.lst
 	echo_header "Searching for old liggering files ..."
-	grep "^X" config/$config/packages |
+	grep "^X" config/$config/packages | cut -d' ' -f5 | sed 's,.*=,,' |
 	if [ $ROCKCFG_PKGFILE_VER = 1 ] ; then
-		cut -d' ' -f5-6 | sed "s/ /-/"
+		while read p; do
+			v=$( grep '^Package Name and Version:' \
+				build/$ROCKCFG_ID/var/adm/packages/$p | cut -f6 -d' ' )
+			echo "$p-$v"
+		done
 	else
-		cut -d' ' -f5
+		cat
 	fi > $pkglst
 	for file in $( ls build/$ROCKCFG_ID/ROCK/pkgs/ ) ; do
 		x="$file"
@@ -316,7 +320,12 @@ pkgloop_package() {
 			mkdir -p "${build_pkgs}"
 
 			if [ "$ROCKCFG_PKGFILE_VER" = 1 ]
-			then v="-${pkg_ver}"; else v=""; fi
+			then
+				v="-$( grep '^Package Name and Version:' \
+					${build_root}/var/adm/packages/$pkg_name | cut -f6 -d' ' )"
+			else
+				v=""
+			fi
 
 			echo_status "Building build/.../pkgs/`
 					`${pkg_name}${v}.tar.bz2"