diff -u orig/build-common.sh changed/build-common.sh
--- orig/build-common.sh	2017-11-30 20:55:06.000000000 +0100
+++ changed/build-common.sh	2018-01-09 15:10:06.023557065 +0100
@@ -281,7 +281,7 @@
 LIBICONV=libiconv-$LIBICONV_VER
 ZLIB=zlib-$ZLIB_VER
 ENV_VAR_UPDATE=EnvVarUpdate
-PYTHON_WIN=python-$PYTHON_WIN_VER
+PYTHON_WIN=python-$PYTHON_WIN_VER.amd64
 
 GMP_PACK=$GMP.tar.bz2
 MPFR_PACK=$MPFR.tar.bz2
@@ -380,8 +380,8 @@
         SEDOPTION='-r'
     fi
     GCC_VER_SHORT=$GCC_VER_NAME
-    HOST_MINGW=i686-w64-mingw32
-    HOST_MINGW_TOOL=i686-w64-mingw32
+    HOST_MINGW=x86_64-w64-mingw32
+    HOST_MINGW_TOOL=x86_64-w64-mingw32
     TARGET=arm-none-eabi
     ENV_CFLAGS=
     ENV_CPPFLAGS=
@@ -400,7 +400,7 @@
     OBJ_SUFFIX_NATIVE=$TARGET-$RELEASEDATE-$HOST_NATIVE
     PACKAGE_NAME=gcc-$TARGET-$GCC_VER_NAME-$RELEASEVER
     PACKAGE_NAME_NATIVE=$PACKAGE_NAME-$PACKAGE_NAME_SUFFIX
-    PACKAGE_NAME_MINGW=$PACKAGE_NAME-win32
+    PACKAGE_NAME_MINGW=$PACKAGE_NAME-win64
     INSTALL_PACKAGE_NAME=gcc-$TARGET-$GCC_VER_NAME-$RELEASEVER
     INSTALLBASE="GNU Tools Arm Embedded"
     APPNAME="$PKGVERSION $GCC_VER_SHORT $release_year"
diff -u orig/build-toolchain.sh changed/build-toolchain.sh
--- orig/build-toolchain.sh	2017-11-30 20:55:06.000000000 +0100
+++ changed/build-toolchain.sh	2018-01-09 14:14:43.272262000 +0100
@@ -665,7 +665,7 @@
 saveenv
 saveenvvar CFLAGS "-I$BUILDDIR_MINGW/host-libs/zlib/include -O2"
 saveenvvar CPPFLAGS "-I$BUILDDIR_MINGW/host-libs/zlib/include"
-saveenvvar LDFLAGS "-L$BUILDDIR_MINGW/host-libs/zlib/lib -Wl,/usr/i686-w64-mingw32/lib/CRT_glob.o"
+saveenvvar LDFLAGS "-L$BUILDDIR_MINGW/host-libs/zlib/lib -Wl,/usr/x86_64-w64-mingw32/lib/CRT_glob.o"
 $SRCDIR/$BINUTILS/configure --build=$BUILD \
     --host=$HOST_MINGW \
     --target=$TARGET \
@@ -796,7 +796,7 @@
 	saveenv
 	saveenvvar CFLAGS "-I$BUILDDIR_MINGW/host-libs/zlib/include -O2"
 	saveenvvar CPPFLAGS "-I$BUILDDIR_MINGW/host-libs/zlib/include"
-	saveenvvar LDFLAGS "-L$BUILDDIR_MINGW/host-libs/zlib/lib -Wl,/usr/i686-w64-mingw32/lib/CRT_glob.o"
+	saveenvvar LDFLAGS "-L$BUILDDIR_MINGW/host-libs/zlib/lib -Wl,/usr/x86_64-w64-mingw32/lib/CRT_glob.o"
 	$SRCDIR/$GDB/configure --build=$BUILD \
 	    --host=$HOST_MINGW \
 	    --target=$TARGET \