diff --git a/bootstrap b/bootstrap
index a6105448..4a3cfe62 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,27 +1,27 @@
 #!/bin/sh
 
-which autoconf
+command -v autoconf
 if ! test $? -eq 0
 then
   echo "error, install autoconf"
   exit 1
 fi
 
-which automake
+command -v automake
 if ! test $? -eq 0
 then
   echo "error, install automake"
   exit 1
 fi
 
-which libtool || which libtoolize
+command -v libtool || command -v libtoolize
 if ! test $? -eq 0
 then
   echo "error, install libtool"
   exit 1
 fi
 
-which pkg-config
+command -v pkg-config
 if ! test $? -eq 0
 then
   echo "error, install pkg-config"
diff --git a/genkeymap/dump-keymaps.sh b/genkeymap/dump-keymaps.sh
index b95305c7..f3abb1fc 100755
--- a/genkeymap/dump-keymaps.sh
+++ b/genkeymap/dump-keymaps.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-which setxkbmap
+command -v setxkbmap
 if test $? -ne 0
 then
   echo "error, setxkbmap not found"