diff --git a/shutils/pkgtarget_funcs.sh b/shutils/pkgtarget_funcs.sh
index ece6df4117c..32aee2adaff 100644
--- a/shutils/pkgtarget_funcs.sh
+++ b/shutils/pkgtarget_funcs.sh
@@ -67,7 +67,7 @@ install_pkg()
 	#
 	# We are going to install a new package.
 	#
-	prepare_tmpl
+	setup_tmpl $curpkgn
 
 	#
 	# Install dependencies required by this package.
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 99896460b63..ea6a4e53b08 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -91,15 +91,17 @@ setup_tmpl()
 
 	[ -z "$pkg" ] && msg_error "missing package name after target."
 
+	. $XBPS_SHUTILSDIR/tmpl_vars.sh
+
 	if [ -f "$XBPS_TEMPLATESDIR/$pkg.tmpl" ]; then
 		if [ "$pkgname" != "$pkg" ]; then
-			. $XBPS_SHUTILSDIR/tmpl_vars.sh
 			. $XBPS_TEMPLATESDIR/$pkg.tmpl
 		fi
 		prepare_tmpl
 	else
 		msg_error "cannot find '$pkg' template build file."
 	fi
+
 }
 
 #