--- a/scripts/spidermonkey_builds/spidermonkey.sh
+++ b/scripts/spidermonkey_builds/spidermonkey.sh
@@ -38,21 +38,16 @@ while [ $# -gt 0 ]; do
         --ttserver)
             # Note that this script (and tooltool_wrapper.sh, and tooltool.py)
             # only accepts a single tooltool server, so all but the last will
             # be ignored.
             shift
             TT_SERVER="$1"
             shift
             ;;
-        --ttauthfile)
-            shift
-            httool_args+=(--authentication-file "$1")
-            shift
-            ;;
         -r|--rev)
             shift
             hgtool_args+=(--clone-by-revision -r "$1")
             shift
             ;;
         --dep)
             shift
             noclean=1
@@ -136,19 +131,19 @@ else
       TT_WRAPPER=$SCRIPTS_DIR/scripts/tooltool/tooltool_wrapper.sh
       manifest_platform=${platform%-debug}
       if [ "$manifest_platform" = linux ]; then
           manifest_platform=linux32
       fi
       TT_MANIFEST=$SOURCE/browser/config/tooltool-manifests/$manifest_platform/releng.manifest
       TT_BOOTSTRAP=setup.sh
       if [ "$OSTYPE" = "msys" ]; then
-          $TT_WRAPPER $TT_MANIFEST $TT_SERVER $TT_BOOTSTRAP 'c:\mozilla-build\python27\python.exe' C:/mozilla-build/tooltool.py
+          $TT_WRAPPER $TT_MANIFEST $TT_SERVER $TT_BOOTSTRAP 'c:\mozilla-build\python27\python.exe' C:/mozilla-build/tooltool.py --authentication-file c:/builds/relengapi.tok
       else
-          $TT_WRAPPER $TT_MANIFEST $TT_SERVER $TT_BOOTSTRAP /builds/tooltool.py
+          $TT_WRAPPER $TT_MANIFEST $TT_SERVER $TT_BOOTSTRAP /builds/tooltool.py --authentication-file /builds/relengapi.tok
       fi
 
       if [[ "$OSTYPE" == darwin* ]]; then
           export CC=$(pwd)/clang/bin/clang
           export CXX=$(pwd)/clang/bin/clang++
       elif [ "$OSTYPE" = "linux-gnu" ]; then
           export CC=$(pwd)/gcc/bin/gcc
           export CXX=$(pwd)/gcc/bin/g++