diff --git a/xbps-src/shutils/builddep_funcs.sh b/xbps-src/shutils/builddep_funcs.sh
index adbf04206f4..ee124e23654 100644
--- a/xbps-src/shutils/builddep_funcs.sh
+++ b/xbps-src/shutils/builddep_funcs.sh
@@ -73,7 +73,7 @@ install_pkg_deps()
 		# Iterate again, this will check if there are more
 		# required deps for current pkg.
 		#
-		install_pkg_deps $j $curpkg
+		install_pkg_deps $j $curpkg || return $?
 		prev_pkg="$j"
 	done
 
@@ -84,10 +84,10 @@ install_pkg_deps()
 			return $?
 		elif [ $? -eq 1 ]; then
 			# Package not found, build from source.
-			install_pkg $curpkgname
+			install_pkg $curpkgname || return $?
 		fi
 	else
-		install_pkg $curpkgname
+		install_pkg $curpkgname || return $?
 	fi
 	[ -n "$prev_pkg" ] && unset prev_pkg
 }
@@ -178,13 +178,13 @@ install_dependencies_pkg()
 					continue
 				else
 					# package not found, build source.
-					install_pkg $pkgn
+					install_pkg $pkgn || return $?
 				fi
 			else
-				install_pkg $pkgn
+				install_pkg $pkgn || return $?
 			fi
 		else
-			install_pkg_deps "${i}" $pkg
+			install_pkg_deps "${i}" $pkg || return $?
 		fi
 	done
 }
diff --git a/xbps-src/shutils/pkgtarget_funcs.sh.in b/xbps-src/shutils/pkgtarget_funcs.sh.in
index b55337aa906..fa159003e79 100644
--- a/xbps-src/shutils/pkgtarget_funcs.sh.in
+++ b/xbps-src/shutils/pkgtarget_funcs.sh.in
@@ -64,8 +64,7 @@ install_pkg()
 	# Install dependencies required by this package.
 	#
 	if [ -z "$doing_deps" ]; then
-		install_dependencies_pkg $pkg
-		[ $? -ne 0 ] && return $?
+		install_dependencies_pkg $pkg || return $?
 		#
 		# At this point all required deps are installed, and
 		# only remaining is the origin package; install it.
@@ -98,7 +97,7 @@ install_pkg()
 	# Install pkg into destdir.
 	set_build_vars
 	env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR}	\
-		dontrm_builddir=${dontrm_builddir}			\
+		dontrm_builddir=${dontrm_builddir} wrksrc=${wrksrc}	\
 		${fakeroot_cmd} ${fakeroot_cmd_args}			\
 		@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-doinst-helper	\
 		${curpkgn} || return $?
diff --git a/xbps-src/shutils/tmpl_funcs.sh.in b/xbps-src/shutils/tmpl_funcs.sh.in
index de64addc275..fb9c9a06751 100644
--- a/xbps-src/shutils/tmpl_funcs.sh.in
+++ b/xbps-src/shutils/tmpl_funcs.sh.in
@@ -111,6 +111,7 @@ setup_tmpl()
 		reset_tmpl_vars
 		. $XBPS_SRCPKGDIR/${pkg}/template
 		prepare_tmpl
+		set_build_vars
 	else
 		msg_error "Cannot find $pkg build template file."
 	fi