--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -2,17 +2,17 @@
 
 # Find out ASAP if some command breaks here, because we're copying a lot of
 # files we don't actually maintain ourselves, and requirements could easily be
 # broken.
 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.
 : ${STAGING:=/tmp/mozjs-src-pkg}
 # The place to put the resulting tarball.
 : ${DIST:=/tmp}
 
 if [[ -f "$SRCDIR/../../config/milestone.txt" ]]; then

--- a/taskcluster/scripts/builder/hazard-analysis.sh
+++ b/taskcluster/scripts/builder/hazard-analysis.sh
@@ -34,17 +34,18 @@ fi
 function build_js_shell () {
     # Must unset MOZ_OBJDIR and MOZCONFIG here to prevent the build system from
     # inferring that the analysis output directory is the current objdir. We
     # need a separate objdir here to build the opt JS shell to use to run the
     # analysis.
     (
     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
     mkdir -p $HAZARD_SHELL_OBJDIR || true
     cd $HAZARD_SHELL_OBJDIR
     $JS_SRCDIR/configure --enable-optimize --disable-debug --enable-ctypes --enable-nspr-build --without-intl-api --with-ccache
     make -j4
     ) # Restore MOZ_OBJDIR and MOZCONFIG