diff --git a/bootstrap.sh b/bootstrap.sh
index 6254f8d5f1..83e15e962d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -381,7 +381,7 @@ bootstrap_fs() {
 }
 
 bootstrap_libs_pre() {
-  case "$i" in
+  case "$1" in
     ldns)
       # This file shouldn't even be in the tree as it's autogenerated
       # during bootstrap, but some people report it breaks the build
@@ -392,7 +392,7 @@ bootstrap_libs_pre() {
 }
 
 bootstrap_libs_post() {
-  case "$i" in
+  case "$1" in
     ldns) (cd $BASEDIR/libs/ldns && mv install-sh~ install-sh) ;;
   esac
 }
@@ -406,13 +406,12 @@ bootstrap_libs() {
         continue
         ;;
     esac
-    bootstrap_libs_pre
+    bootstrap_libs_pre ${i}
     if ! ${BGJOB}; then
-      libbootstrap ${i}
+      libbootstrap ${i} ; bootstrap_libs_post ${i}
     else
-      libbootstrap ${i} &
+      ((libbootstrap ${i} ; bootstrap_libs_post ${i}) &)
     fi
-    bootstrap_libs_post
   done
 }