diff --git a/scripts/functions b/scripts/functions
index ab721aba8..92872bf8e 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -507,16 +507,15 @@ dump_env() {
 
 # Check if a package is already installed
 #
-# It does check the build-list if not in the rebuild stage - and
-# the really installed package data for rebuilds (and so manual builds).
+# Always checks the really installed package data. Checking the package list
+# doesn't work in Crystal+addon targets, where some packages are only built 
+# in stage 9. The package data however is always there if the package has been
+# installed.
 #
 pkginstalled() {
 	local pattern="$1"; pattern="${pattern//+/\\+}"
-	if [ "$stagelevel" -le 8 ] ; then
-		egrep -q "^X.* ($pattern) " $base/config/$config/packages
-	else
-		ls $root/var/adm/flists | egrep -q "^($pattern)$"
-	fi
+
+	ls $root/var/adm/flists | egrep -q "^($pattern)$"
 }
 
 # Register a window-manager