diff --git a/scripts/Build-Target b/scripts/Build-Target
index 380f3d5..0b572d1 100755
--- a/scripts/Build-Target
+++ b/scripts/Build-Target
@@ -3,7 +3,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: scripts/Build-Target
-# Copyright (C) 2006 - 2008 The OpenSDE Project
+# Copyright (C) 2006 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -120,7 +120,8 @@ pkgloop() {
 		exit 0
 	fi
 
-	local pkglst=`mktemp` errors=0; rm -f tmp/invalid-files.lst
+	local invalidfiles="tmp/invalid-files-$config.lst"
+	local pkglst=`mktemp` errors=0; rm -f "$invalidfiles"
 	echo_header "Searching for old lingering files ..."
 	sed '/^[^X]/d ; s,.*=,,' config/$config/packages | cut -d' ' -f5 |
 	if [ $SDECFG_PKGFILE_VER = 1 ] ; then
@@ -141,9 +142,8 @@ pkgloop() {
 		esac
 		if ! grep -qx "$x" $pkglst && ! test "$x" = packages.db ; then
 			file="build/$SDECFG_ID/TOOLCHAIN/pkgs/$file"
-			echo_error "$file should not be present" \
-			           "(now in tmp/invalid-files.lst)!"
-			mkdir -p tmp; echo "$file" >> tmp/invalid-files.lst
+			echo_error "$file should not be present (now in $invalidfiles)!"
+			mkdir -p tmp; echo "$file" >> "$invalidfiles"
 			errors=1
 		fi
 	done
@@ -155,8 +155,8 @@ pkgloop() {
 				x="$file"
 			fi
 			if ! grep -q "$x" $pkglst ; then
-				echo_error "$dir/$file should not be present (now in tmp/invalid-files.lst)!"
-				mkdir -p tmp; echo "$dir/$file" >> tmp/invalid-files.lst
+				echo_error "$dir/$file should not be present (now in $invalidfiles)!"
+				mkdir -p tmp; echo "$dir/$file" >> "$invalidfiles"
 				errors=1
 			fi
 		done
@@ -171,8 +171,8 @@ pkgloop() {
 
 		if ! grep -q "$x" $pkglst ; then
 			file="build/$SDECFG_ID/var/adm/logs/$file"
-			echo_error "$file should not be present (now in tmp/invalid-files.lst)!"
-			mkdir -p tmp; echo "$file" >> tmp/invalid-files.lst
+			echo_error "$file should not be present (now in $invalidfiles)!"
+			mkdir -p tmp; echo "$file" >> "$invalidfiles"
 			errors=1
 		fi
 	done