diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index 7b53855..c0387a2 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -52,8 +52,8 @@ make
 make INSTALL_ROOT="$dir_install" install
 
 mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-for bin in "$dir_install/$dir_prefix/$dir_libdir/$name/bin/"*; do
-    ln -s "../$dir_libdir/$name/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-$name"
+for bin in $(find "$dir_install/$dir_prefix/$dir_libdir/$name/bin/" -type f -printf '%P '); do
+    ln -s "../$dir_libdir/$name/bin/$bin" "$dir_install/$dir_prefix/$dir_bindir/$bin-$name"
 done
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat
index 629ae24..5fc5ff8 100644
--- a/satellites/qt5-tools.sat
+++ b/satellites/qt5-tools.sat
@@ -15,8 +15,8 @@ cd "qt$submodule-opensource-src-$version"
 compile_qt 5
 
 mkdir -p "$dir_install/$dir_prefix/$dir_bindir"
-for bin in "$dir_install/$dir_prefix/$dir_libdir/$name/bin/"*; do
-    ln -s "../$dir_libdir/$name/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-$name"
+for bin in $(find "$dir_install/$dir_prefix/$dir_libdir/$name/bin/" -type f -printf '%P '); do
+    ln -s "../$dir_libdir/$name/bin/$bin" "$dir_install/$dir_prefix/$dir_bindir/$bin-$name"
 done
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/waf.sat b/satellites/waf.sat
index 5ad1efb..6034e89 100644
--- a/satellites/waf.sat
+++ b/satellites/waf.sat
@@ -11,7 +11,7 @@ header_end
 cd "$name-$version"
 compile_waf -b "python3 ./$name-light" -- --make-waf
 
-# Strip packed library from binary. The plain files are installed separately.
+# Strip the packed library from the program. The plain files are installed separately.
 sed -i -e '/^#==>$/,/^#<==$/d' "$name"
 
 # Strip revision from the libdir name