diff --git a/shutils/extract_funcs.sh b/shutils/extract_funcs.sh
index 5a619116b55..5278aea461e 100644
--- a/shutils/extract_funcs.sh
+++ b/shutils/extract_funcs.sh
@@ -54,8 +54,7 @@ extract_distfiles()
 	#
 	# If noextract is set, do a "fake extraction".
 	#
-	if [ -n "$noextract" ]; then
-		msg_normal "Manual extraction for $pkgname-$lver."
+	if [ -z "$distfiles" -o -n "$noextract" ]; then
 		mkdir $wrksrc
 		touch -f $XBPS_EXTRACT_DONE
 		return 0
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 78bd4578d1f..a7d5825db06 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -160,11 +160,6 @@ prepare_tmpl()
 	#
 	[ "$build_style" = "meta-template" ] && return 0
 
-	if [ "$build_style" = "custom-install" -a -z "$distfiles" ]; then
-		set_tmpl_common_vars
-		return 0
-	fi
-
 	REQ_VARS="pkgname version build_style short_desc long_desc"
 
 	# Check if required vars weren't set.