diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index 33c69f3b19e..66d71053552 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -127,30 +127,31 @@ xbps_write_metadata_pkg_real()
 		triggers="info-files $triggers"
 		msg_normal "Package '$pkgname ($lver)': processing info(1) files..."
 
-		for f in $(find ${DESTDIR}/usr/share/info -type f -follow); do
-			j=$(echo $f|sed -e "$fpattern")
+		find ${DESTDIR}/usr/share/info -type f -follow | while read f
+		do
+			j=$(echo "$f"|sed -e "$fpattern")
 			[ "$j" = "" ] && continue
 			[ "$j" = "/usr/share/info/dir" ] && continue
 			# Ignore compressed files.
-			if $(echo $j|grep -q '.*.gz$'); then
+			if $(echo "$j"|grep -q '.*.gz$'); then
 				continue
 			fi
 			# Ignore non info files.
-			if ! $(echo $j|grep -q '.*.info$') && \
-			   ! $(echo $j|grep -q '.*.info-[0-9]*$'); then
+			if ! $(echo "$j"|grep -q '.*.info$') && \
+			   ! $(echo "$j"|grep -q '.*.info-[0-9]*$'); then
 				continue
 			fi
-			if [ -h ${DESTDIR}/$j ]; then
-				dirat=$(dirname $j)
-				lnkat=$(readlink ${DESTDIR}/$j)
-				newlnk=$(basename $j)
-				rm -f ${DESTDIR}/$j
-				cd ${DESTDIR}/$dirat
-				ln -s ${lnkat}.gz ${newlnk}.gz
+			if [ -h ${DESTDIR}/"$j" ]; then
+				dirat=$(dirname "$j")
+				lnkat=$(readlink ${DESTDIR}/"$j")
+				newlnk=$(basename "$j")
+				rm -f ${DESTDIR}/"$j"
+				cd ${DESTDIR}/"$dirat"
+				ln -s "${lnkat}".gz "${newlnk}".gz
 				continue
 			fi
 			echo "   Compressing info file: $j..."
-			gzip -q9 ${DESTDIR}/$j
+			gzip -q9 ${DESTDIR}/"$j"
 		done
 	fi
 
@@ -160,23 +161,24 @@ xbps_write_metadata_pkg_real()
 	#
 	if [ -d "${DESTDIR}/usr/share/man" ]; then
 		msg_normal "Package '$pkgname ($lver)': processing manual pages..."
-		for f in $(find ${DESTDIR}/usr/share/man -type f -follow); do
-			j=$(echo $f|sed -e "$fpattern")
+		find ${DESTDIR}/usr/share/man -type f -follow | while read f
+		do
+			j=$(echo "$f"|sed -e "$fpattern")
 			[ "$j" = "" ] && continue
-			if $(echo $j|grep -q '.*.gz$'); then
+			if $(echo "$j"|grep -q '.*.gz$'); then
 				continue
 			fi
-			if [ -h ${DESTDIR}/$j ]; then
-				dirat=$(dirname $j)
-				lnkat=$(readlink ${DESTDIR}/$j)
-				newlnk=$(basename $j)
-				rm -f ${DESTDIR}/$j
-				cd ${DESTDIR}/$dirat
-				ln -s ${lnkat}.gz ${newlnk}.gz
+			if [ -h ${DESTDIR}/"$j" ]; then
+				dirat=$(dirname "$j")
+				lnkat=$(readlink ${DESTDIR}/"$j")
+				newlnk=$(basename "$j")
+				rm -f ${DESTDIR}/"$j"
+				cd ${DESTDIR}/"$dirat"
+				ln -s "${lnkat}".gz "${newlnk}".gz
 				continue
 			fi
 			echo "   Compressing manpage: $j..."
-			gzip -q9 ${DESTDIR}/$j
+			gzip -q9 ${DESTDIR}/"$j"
 		done
 	fi
 
@@ -188,8 +190,9 @@ xbps_write_metadata_pkg_real()
 	# Pass 1: add links.
 	echo "<key>links</key>" >> $TMPFPLIST
 	echo "<array>" >> $TMPFPLIST
-	for f in $(find ${DESTDIR} -type l); do
-		j=$(echo $f|sed -e "$fpattern")
+	find ${DESTDIR} -type l | while read f
+	do
+		j=$(echo "$f"|sed -e "$fpattern")
 		[ "$j" = "" ] && continue
 		echo "$j" >> $TMPFLIST
 		echo "<dict>" >> $TMPFPLIST
@@ -202,8 +205,9 @@ xbps_write_metadata_pkg_real()
 	# Pass 2: add regular files.
 	echo "<key>files</key>" >> $TMPFPLIST
 	echo "<array>" >> $TMPFPLIST
-	for f in $(find ${DESTDIR} -type f); do
-		j=$(echo $f|sed -e "$fpattern")
+	find ${DESTDIR} -type f | while read f
+	do
+		j=$(echo "$f"|sed -e "$fpattern")
 		[ "$j" = "" ] && continue
 		echo "$j" >> $TMPFLIST
 		# Skip configuration files.
@@ -215,7 +219,7 @@ xbps_write_metadata_pkg_real()
 		echo "<key>file</key>" >> $TMPFPLIST
 		echo "<string>$j</string>" >> $TMPFPLIST
 		echo "<key>sha256</key>" >> $TMPFPLIST
-		echo "<string>$(${XBPS_DIGEST_CMD} $f)</string>"  \
+		echo "<string>$(${XBPS_DIGEST_CMD} "$f")</string>"  \
 			>> $TMPFPLIST
 		echo "</dict>" >> $TMPFPLIST
 	done
@@ -224,8 +228,9 @@ xbps_write_metadata_pkg_real()
 	# Pass 3: add directories.
 	echo "<key>dirs</key>" >> $TMPFPLIST
 	echo "<array>" >> $TMPFPLIST
-	for f in $(find ${DESTDIR} -type d|sort -ur); do
-		j=$(echo $f|sed -e "$fpattern")
+	find ${DESTDIR} -type d|sort -ur | while read f
+	do
+		j=$(echo "$f"|sed -e "$fpattern")
 		[ "$j" = "" ] && continue
 		echo "$j" >> $TMPFLIST
 		echo "<dict>" >> $TMPFPLIST
@@ -240,13 +245,13 @@ xbps_write_metadata_pkg_real()
 		echo "<key>conf_files</key>" >> $TMPFPLIST
 		echo "<array>" >> $TMPFPLIST
 		for f in ${conf_files}; do
-			i=${DESTDIR}/${f}
-			[ ! -f ${i} ] && continue
+			i=${DESTDIR}/"${f}"
+			[ ! -f "${i}" ] && continue
 			echo "<dict>" >> $TMPFPLIST
 			echo "<key>file</key>" >> $TMPFPLIST
 			echo "<string>$f</string>" >> $TMPFPLIST
 			echo "<key>sha256</key>" >> $TMPFPLIST
-			echo "<string>$(${XBPS_DIGEST_CMD} ${i})</string>" \
+			echo "<string>$(${XBPS_DIGEST_CMD} "${i}")</string>" \
 				>> $TMPFPLIST
 			echo "</dict>" >> $TMPFPLIST
 		done
diff --git a/xbps-src/shutils/strip_files.sh b/xbps-src/shutils/strip_files.sh
index 9fa37e5923c..45e7d2af436 100644
--- a/xbps-src/shutils/strip_files.sh
+++ b/xbps-src/shutils/strip_files.sh
@@ -56,13 +56,14 @@ strip_files_real()
 	fi
 
 	msg_normal "Package '$pkgname ($lver)': stripping files, please wait..."
-	for f in $(find ${DESTDIR} -type f); do
+	find ${DESTDIR} -type f | while read f
+	do
 		case "$(file -biz $f)" in
 		application/x-executable*)
-			strip $f && \
+			strip "$f" && \
 				echo "   Stripped executable: $(basename $f)";;
 		application/x-sharedlib*|application/x-archive*)
-			strip -S $f && \
+			strip -S "$f" && \
 				echo "   Stripped library: $(basename $f)";;
 		esac
 	done
diff --git a/xbps-src/shutils/verify_rundeps.sh b/xbps-src/shutils/verify_rundeps.sh
index 3a64d15a8c7..75b09b9e1de 100644
--- a/xbps-src/shutils/verify_rundeps.sh
+++ b/xbps-src/shutils/verify_rundeps.sh
@@ -59,10 +59,11 @@ verify_rundeps()
 	[ -n "$noarch" -o -n "$noverifyrdeps" ] && return 0
 	msg_normal "Package '$pkgname ($lver)': verifying required run dependencies, please wait..."
 
-	for f in $(find ${PKG_DESTDIR} -type f); do
+	find ${PKG_DESTDIR} -type f | while read f
+	do
 		# Don't check dirs specified in ignore_vdeps_dir.
 		for j in ${ignore_vdeps_dir}; do
-			if grep -q ${j} ${f}; then
+			if grep -q ${j} "${f}"; then
 				igndir=1
 				break
 			fi