diff --git a/bootstrap b/bootstrap
index 805df70d8..6844d47a0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -44,7 +44,7 @@ if test x`uname` = xDarwin ; then
 else
 	libtoolize=libtoolize
 fi
-lt=`which $libtoolize`
+lt=`command -v $libtoolize --version`
 if test -n "$lt" ; then
 	if test -x "$lt" ; then
 		LTIZE_VER=`$libtoolize --version | head -1 | sed 's/.* \([1-9][0-9]*\(\.[1-9][0-9]*\)\(\.[1-9][0-9]*\)*\).*/\1/'`
@@ -63,7 +63,7 @@ else
 fi
 
 # Check Autoconf version
-ac=`which autoconf`
+ac=`command -v autoconf`
 if test -n "$ac" ; then
 	if test -x "$ac" ; then
 		AC_VER=`autoconf --version | head -1 | sed 's/^[^0-9]*//'`
@@ -82,7 +82,7 @@ else
 	errors="Autoconf not found. QuakeForge git requires autoconf to bootstrap itself.\n$errors"
 fi
 
-am=`which automake`
+am=`command -v automake`
 if test -n "$am" ; then
 	if test -x "$am" ; then
 		AM_VER=`automake --version | head -1 | sed -e 's/automake (GNU automake) //' -e 's/\-p.*$//'`