diff --git a/js/src/make-source-package.sh b/js/src/make-source-package.sh
index 22ab21f5d38f..b2b14a81ce68 100755
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -7,7 +7,7 @@ set -e
 
 : ${MKDIR:=mkdir}
 : ${TAR:=tar}
-: ${AUTOCONF:=autoconf-2.13}
+: ${AUTOCONF:=$(which autoconf-2.13 autoconf2.13 | head -1)}
 : ${SRCDIR:=$(cd $(dirname $0); pwd 2>/dev/null)}
 : ${MOZJS_NAME:=mozjs}
 # The place to gather files to be added to the tarball.
diff --git a/taskcluster/scripts/builder/hazard-analysis.sh b/taskcluster/scripts/builder/hazard-analysis.sh
index 7c38150ce4ea..97af53ed17ce 100755
--- a/taskcluster/scripts/builder/hazard-analysis.sh
+++ b/taskcluster/scripts/builder/hazard-analysis.sh
@@ -39,7 +39,8 @@ function build_js_shell () {
     (
     unset MOZ_OBJDIR
     unset MOZCONFIG
-    ( cd $JS_SRCDIR; autoconf-2.13 )
+    cp -P $JS_SRCDIR/configure.in $JS_SRCDIR/configure
+    chmod +x $JS_SRCDIR/configure
     if [[ -z "$HAZ_DEP" ]]; then
         [ -d $HAZARD_SHELL_OBJDIR ] && rm -rf $HAZARD_SHELL_OBJDIR
     fi