diff --git a/common/hooks/post-install/03-remove-empty-dirs.sh b/common/hooks/post-install/03-remove-empty-dirs.sh
index 4e73f6b34fc..00f198d52a2 100644
--- a/common/hooks/post-install/03-remove-empty-dirs.sh
+++ b/common/hooks/post-install/03-remove-empty-dirs.sh
@@ -1,7 +1,7 @@
 # This hooks removes empty dirs and warns about them.
 
 hook() {
-	for f in $(find ${PKGDESTDIR} -type d -empty|sort -r); do
+	find ${PKGDESTDIR} -type d -empty -print0|sort -z -r|while IFS="" read f; do
 		_dir="${f##${PKGDESTDIR}}"
 		[ -z "${_dir}" ] && continue
 		rmdir --ignore-fail-on-non-empty -p "$f" &>/dev/null