--- a/browser/config/mozconfigs/win32/mingw32
+++ b/browser/config/mozconfigs/win32/mingw32
@@ -43,17 +43,17 @@ ac_add_options --disable-webrtc # Bug 13
 ac_add_options --disable-maintenance-service
 
 # Find our toolchain
 CC="$TOOLTOOL_DIR/mingw32/bin/i686-w64-mingw32-gcc"
 CXX="$TOOLTOOL_DIR/mingw32/bin/i686-w64-mingw32-g++"
 
 # We want to make sure we use binutils and other binaries in the tooltool
 # package.
-mk_add_options "export PATH=$TOOLTOOL_DIR/mingw32/bin:$TOOLTOOL_DIR/wine/bin:$TOOLTOOL_DIR/upx/bin:$TOOLTOOL_DIR/fxc2/bin:$PATH"
+mk_add_options "export PATH=$TOOLTOOL_DIR/mingw32/bin:$TOOLTOOL_DIR/nsis/bin:$TOOLTOOL_DIR/wine/bin:$TOOLTOOL_DIR/upx/bin:$TOOLTOOL_DIR/fxc2/bin:$PATH"
 
 LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/mingw32/lib64
 mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 
 # Do not include the visual studio related mozconfigs of course
 
 ac_add_options --with-branding=browser/branding/nightly
 

--- a/taskcluster/scripts/misc/build-mingw32-nsis.sh
+++ b/taskcluster/scripts/misc/build-mingw32-nsis.sh
@@ -8,17 +8,17 @@ set -x -e -v
 #   DEBUG: The command returned non-zero exit status 1.
 #   DEBUG: Its error output was:
 #   DEBUG: | Error: opening stub "/home/worker/workspace/mingw32/
 #   DEBUG: | Error initalizing CEXEBuild: error setting
 #   ERROR: Failed to get nsis version.
 
 WORKSPACE=$HOME/workspace
 HOME_DIR=$WORKSPACE/build
-INSTALL_DIR=$WORKSPACE/build/src/mingw32
+INSTALL_DIR=$WORKSPACE/build/src/nsis
 TOOLTOOL_DIR=$WORKSPACE/build/src
 UPLOAD_DIR=$HOME/artifacts
 
 mkdir -p $INSTALL_DIR
 
 root_dir=$HOME_DIR
 data_dir=$HOME_DIR/src/build/unix/build-gcc
 
@@ -93,13 +93,11 @@ bunzip2 nsis-3.01-src.tar.bz2
 tar xaf nsis-3.01-src.tar
 cd nsis-3.01-src
 # I don't know how to make the version work with the environment variables/config flags the way the author appears to
 sed -i "s/'VERSION', 'Version of NSIS', cvs_version/'VERSION', 'Version of NSIS', '3.01'/" SConstruct
 scons XGCC_W32_PREFIX=i686-w64-mingw32- ZLIB_W32=../zlib-1.2.11 SKIPUTILS="NSIS Menu" PREFIX=$INSTALL_DIR/ install
 
 # --------------
 
+mkdir -p $UPLOAD_DIR
 cd $WORKSPACE/build/src
-tar caf nsis.tar.xz mingw32
-
-mkdir -p $UPLOAD_DIR
-cp nsis.tar.* $UPLOAD_DIR
+tar caf $UPLOAD_DIR/nsis.tar.xz nsis