diff --git a/scripts/functions b/scripts/functions
index 4f5f579c9..2acd29172 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -438,11 +438,11 @@ dump_env() {
 # the really installed package data for rebuilds (and so manual builds).
 #
 pkginstalled() {
+	local pattern="$1"; pattern="${pattern//+/\\+}"
 	if [ "$stagelevel" -le 8 ] ; then
-		local pattern="$1"; pattern="${pattern//+/\\+}"
 		egrep -q "^X.* ($pattern) " $base/config/$config/packages
 	else
-		[ -f $root/var/adm/packages/$1 ]
+		ls $root/var/adm/flists | egrep -q "^($pattern)$"
 	fi
 }