diff --git a/shutils/extract_funcs.sh b/shutils/extract_funcs.sh
index 76d743e1638..af052ef7321 100644
--- a/shutils/extract_funcs.sh
+++ b/shutils/extract_funcs.sh
@@ -55,7 +55,7 @@ extract_distfiles()
 		count=$(($count + 1))
 	done
 
-	if [ $count -gt 1 ]; then
+	if [ "$count" -gt 1 ]; then
 		if [ -z "$wrksrc" ]; then
 			msg_error "\$wrksrc must be defined with multiple distfiles."
 			exit 1
diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh
index 5cb01f184b2..4fc2e1834a9 100644
--- a/shutils/tmpl_funcs.sh
+++ b/shutils/tmpl_funcs.sh
@@ -106,6 +106,7 @@ setup_tmpl()
 #
 prepare_tmpl()
 {
+	local REQ_VARS=
 	local i=
 	local found=
 
@@ -114,7 +115,11 @@ prepare_tmpl()
 	#
 	[ "$build_style" = "meta-template" ] && return 0
 
-	REQ_VARS="pkgname distfiles version build_style"
+	if [ "$build_style" = "custom-install" -a -z "$distfiles" ]; then
+		mkdir -p $XBPS_BUILDDIR/$pkgname-$version
+	fi
+
+	REQ_VARS="pkgname version build_style short_desc long_desc"
 
 	# Check if required vars weren't set.
 	for i in ${REQ_VARS}; do
diff --git a/templates/xbps-base-chroot.tmpl b/templates/xbps-base-chroot.tmpl
index 6dceee0c3cb..c62be15cb83 100644
--- a/templates/xbps-base-chroot.tmpl
+++ b/templates/xbps-base-chroot.tmpl
@@ -1,7 +1,7 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-chroot
-version=0.3
-build_style=meta-template
+version=0.4
+build_style=custom-install
 short_desc="xbps base packages for the chroot target"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -16,3 +16,15 @@ build_depends="glibc-2.8 kernel-libc-headers-2.6.27.3 bash-3.2 coreutils-6.12
  sed-4.1.5 make-3.81 diffutils-2.8.1 file-4.26 proplib-0.1 patch-2.5.4
  wget-1.11.4 dash-0.5.4"
 run_depends="$build_depends"
+
+do_install()
+{
+	local destdir=$XBPS_DESTDIR/$pkgname-$version
+
+	if [ "$xbps_machine" = "x86_64" ]; then
+		mkdir -p $destdir/usr/lib
+		mkdir -p $destdir/lib
+		cd $destdir && ln -s lib lib64
+		cd $destdir/usr && ln -s lib lib64
+	fi
+}
diff --git a/templates/xbps-base-system.tmpl b/templates/xbps-base-system.tmpl
index 6f5851de7bc..16d628aeb72 100644
--- a/templates/xbps-base-system.tmpl
+++ b/templates/xbps-base-system.tmpl
@@ -1,7 +1,7 @@
 # Template file for 'xbps-base-chroot'
 pkgname=xbps-base-system
 version=0.1
-build_style=meta-template
+build_style=custom-install
 short_desc="xbps base system packages"
 maintainer="Juan RP <xtraeme@gmail.com>"
 long_desc="
@@ -17,3 +17,15 @@ run_depends="$build_depends initng-0.6.10.2 coreutils-6.12 dash-0.5.4
  zlib-1.2.3 file-4.26 diffutils-2.8.1 sed-4.1.5 findutils-4.4.0
  grep-2.5.3 gawk-3.1.6 gzip-1.3.12 bzip2-1.0.5 tar-1.20 ncurses-5.7
  bash-3.2 glibc-2.9 wget-1.11.4"
+
+do_install()
+{
+	local destdir=$XBPS_DESTDIR/$pkgname-$version
+
+	if [ "$xbps_machine" = "x86_64" ]; then
+		mkdir -p $destdir/usr/lib
+		mkdir -p $destdir/lib
+		cd $destdir && ln -s lib lib64
+		cd $destdir/usr && ln -s lib lib64
+	fi
+}