diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg
index 15a139565..22701f996 100755
--- a/scripts/Build-Pkg
+++ b/scripts/Build-Pkg
@@ -570,12 +570,6 @@ elif [ "$ROCKCFG_FLIST" = "find" ] ; then
 	sleep 2
 fi
 
-mkdir -p "$builddir/archdir"
-while read l_cksum l_srctar l_url l_flags ; do
-    [ -z "$l_cksum" ] && continue 
-    ln -s `source_file l_cksum $l_srctar l_url $l_flags` $builddir/archdir/
-done < <( echo "$desc_D" | column_clean )
-
 hook_eval prepare
 
 # define new abort function for errors while building
@@ -660,15 +654,19 @@ abort() {
 
 	(
 		set -e
-		for xsrctar in $( echo "$desc_D" | tr ' ' '\t' | \
-			tr -s '\t' | cut -f2 | sed 's,.\(t\?\)\(gz\|Z\)$,.\1bz2,' )
-		do
-			if [ ! -f $archdir/$xsrctar ]; then
-				echo "File not found: ${archdir#$base/}/$xsrctar"
+
+		mkdir -p "$builddir/archdir"
+		while read l_cksum l_srctar l_url l_flags ; do
+			[ -z "$l_cksum" ] && continue 
+			x=`source_file l_cksum $l_srctar l_url $l_flags`
+			if [ ! -f $x ]; then
+				echo "File not found: ${x#$base/}"
 				echo "Did you run ./scripts/Download for this package?"
 				false
 			fi
-		done
+			ln -vs $x $builddir/archdir/
+		done < <( echo "$desc_D" | column_clean )
+
 		echo "Running main build function '$mainfunction' ..."
 		if [ $xtrace -eq 1 -o $ROCKCFG_XTRACE -eq 1 ] ;	then
 			PS4=$'=[$FUNCNAME:$LINENO (last \\\$?=$?)> ' ; set -o xtrace