diff --git a/scripts/make.sh b/scripts/make.sh
index 207a082..9e4b83e 100755
--- a/scripts/make.sh
+++ b/scripts/make.sh
@@ -102,7 +102,7 @@
 
 # LINK needs optlibs.dat, above
 
-LINK="$(echo $LDOPTIMIZE -o toybox_unstripped -Wl,--as-needed $(cat generated/optlibs.dat))"
+LINK="$(echo $LDOPTIMIZE $LDFLAGS -o toybox_unstripped -Wl,--as-needed $(cat generated/optlibs.dat))"
 genbuildsh > generated/build.sh && chmod +x generated/build.sh || exit 1
 
 echo "Make generated/config.h from $KCONFIG_CONFIG."
@@ -268,7 +268,12 @@
 [ $DONE -ne 0 ] && exit 1
 
 do_loudly $BUILD $LFILES $LINK || exit 1
-do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
+if [ "$STRIP" == no ]
+then
+  mv toybox_unstripped toybox
+else
+  do_loudly ${CROSS_COMPILE}${STRIP} toybox_unstripped -o toybox || exit 1
+fi
 # gcc 4.4's strip command is buggy, and doesn't set the executable bit on
 # its output the way SUSv4 suggests it do so.
 do_loudly chmod +x toybox || exit 1