diff --git a/bootstrap b/bootstrap
index 56e12d087813a4aec051e6f24f3cfafda8fb08bb..b0927b9a7a9c77d37fb05bdf0f5b776fad2112af 100755
--- a/bootstrap
+++ b/bootstrap
@@ -48,12 +48,30 @@ fi
 
 # Check for automake
 amvers="none"
-if automake-1.9 --version >/dev/null 2>&1; then
-  amvers="-1.9"
-elif automake-1.8 --version >/dev/null 2>&1; then
+if automake-1.8 --version >/dev/null 2>&1; then
   amvers="-1.8"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
+elif automake-1.9 --version >/dev/null 2>&1; then
+  amvers="-1.9"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
 elif automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
+  # If we also have 1.6 (>> 1.6.1), use it instead because it is faster
+  if automake-1.6 --version >/dev/null 2>&1; then
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
+      amvers="-1.6"
+    fi
+  fi
 elif automake-1.6 --version >/dev/null 2>&1; then
   amvers="-1.6"
   if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
@@ -206,15 +224,13 @@ libvlcdir = \$(libdir)/vlc/\$(basedir)
 EXTRA_LIBRARIES = ${extra_libs}
 include Modules.am
 
+if !BUILD_MOZILLA
+pic = no
+else
 if HAVE_WIN32
 ### There's no need for pic code on win32 so get rid of this to substantially
 ### reduce the compilation time.
 pic = no
-else
-if BUILD_MOZILLA
-pic = yes
-else
-pic = no
 endif
 endif