diff --git a/scripts/Create-DepDB b/scripts/Create-DepDB
index a90c35985..9c87f697a 100755
--- a/scripts/Create-DepDB
+++ b/scripts/Create-DepDB
@@ -78,6 +78,7 @@ perl -e '
 	foreach my $c (<'$cachedir'/*/*/*.cache>) {
 		my ($pri, $time) = (1, 1);
 		my $pkg = $c; $pkg=~s,^.*/([^/]*)/[^/]*$,$1,; 
+		my $found_dep_entries = 0;
 		my %deps = ();
 
 		$deps{$_} = 1 foreach (keys %{$adddeps{$pkg}});
@@ -92,11 +93,15 @@ perl -e '
 			if (/^\[DEP\]/) {
 				@_ = split /:\S+\s+|\s+/; shift @_;
 				foreach (@_) { $deps{$_} = 1 unless defined $deldeps{$pkg}{$_}; }
+				$found_dep_entries = 1;
 				next;
 			}
 		}
 		close F;
 
+		# no dep_db entry if this package failed in ref build
+		next unless $found_dep_entries;
+
 		$c =~ s/\.cache$/.desc/;
 		open(F, "$c") or die "$!: $c";
 		while (<F>) {
diff --git a/scripts/Create-PkgQueue b/scripts/Create-PkgQueue
index c55856cc7..d71c28523 100755
--- a/scripts/Create-PkgQueue
+++ b/scripts/Create-PkgQueue
@@ -84,7 +84,7 @@ function check_package() {
 		if ( getline dummy < outfile != -1 )
 					build_this_package = 0;
 
-		if ( index(not_present, " " package " ") ) {
+		if ( index(not_present, " " xpackage " ") ) {
 			if (debug && build_this_package)
 				print "DEBUG: Not building " stagelevel "-" \
 				      package ": earlier stages not done " \
@@ -92,13 +92,13 @@ function check_package() {
 			build_this_package = 0;
 		}
 
-		if ( build_this_package && (package in database) ) {
-			split(database[package], a);
+		if ( build_this_package && (xpackage in database) ) {
+			split(database[xpackage], a);
 			buildtime = a[2];
 			priority = a[3];
 
 			for (c in a) {
-				# if ( a[c] == package  ) continue;
+				# if ( a[c] == xpackage  ) continue;
 				# if ( strtonum(c) <= 3 ) continue;
 				if (debug && 0)
 					print "DEBUG: Checking " stagelevel \
@@ -158,14 +158,14 @@ function check_package() {
 			if (single) exit 0;
 		}
 
-		not_present = not_present " " package " ";
+		not_present = not_present " " xpackage " ";
 	}
 	else
 	if ( nobrokendeps )
 	{
 		close(errfile);
 		if ( (getline dummy < errfile != -1) ) {
-			not_present = not_present " " package " ";
+			not_present = not_present " " xpackage " ";
 		}
 	}