diff --git a/bin/xbps-src/main.sh b/bin/xbps-src/main.sh
index d123d3010dd..d45420a4aca 100755
--- a/bin/xbps-src/main.sh
+++ b/bin/xbps-src/main.sh
@@ -220,14 +220,9 @@ build-pkg)
 	. $XBPS_SHUTILSDIR/tmpl_funcs.sh
 	if [ "$2" = "all" ]; then
 		for f in $($XBPS_BIN_CMD list|awk '{print $1}'); do
-			version=$($XBPS_REGPKGDB_CMD version $f)
-			if [ ! -d $XBPS_DESTDIR/$f-${version%_[0-9]*} ]; then
-				echo -n "Ignoring $f-$version, no destination "
-				echo "directory!"
-				continue
-			fi
-			setup_tmpl $f
-			xbps_make_binpkg $f
+			pkg=$(xbps-pkgdb getpkgname $f)
+			setup_tmpl ${pkg}
+			xbps_make_binpkg ${pkg}
 			reset_tmpl_vars
 		done
 	else