diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh
index e2e9945a8ed..7079ff82cc7 100644
--- a/shutils/install_funcs.sh
+++ b/shutils/install_funcs.sh
@@ -78,7 +78,9 @@ install_src_phase()
 
 	msg_normal "Installed $pkgname-$lver into $XBPS_DESTDIR."
 
-	touch -f $XBPS_INSTALL_DONE
+	if [ "$build_style" != "custom-install" -a -z "$distfiles" ]; then
+		touch -f $XBPS_INSTALL_DONE
+	fi
 
 	#
 	# Build subpackages if found.
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 64f6835a238..78bd4578d1f 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -161,6 +161,7 @@ prepare_tmpl()
 	[ "$build_style" = "meta-template" ] && return 0
 
 	if [ "$build_style" = "custom-install" -a -z "$distfiles" ]; then
+		set_tmpl_common_vars
 		return 0
 	fi