diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index 054b9ca270c..bd6df55d9bb 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -8,32 +8,36 @@ _mingw_version=5.0.4
 
 pkgname=cross-x86_64-w64-mingw32
 version=${_mingw_version}
-revision=1
-short_desc="Cross toolchain for Win64"
+revision=2
+short_desc="Cross toolchain for Win64 (GCC ${_gcc_version})"
 maintainer="Aleksey Tulinov <aleksey.tulinov@gmail.com>"
 homepage="https://sourceforge.net/projects/mingw-w64/"
-license="LGPL-3, GPL-3, ZPL"
+license="GPL-2.0-or-later, GPL-3.0-or-later, ZPL-2.1"
 
 distfiles="
- https://ftp.gnu.org/gnu/binutils/binutils-${_binutils_version}.tar.bz2
- https://ftp.gnu.org/gnu/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.bz2
+ ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
+ ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
  http://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
- https://ftp.gnu.org/gnu/mpc/mpc-${_mpc_version}.tar.gz
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
- https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
+ ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="
  1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc
  832ca6ae04636adbb430e865a1451adf6979ab44ca1c8374f61fba65645ce15c
+ 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
  fbe2cd1418b321f5c899ce4f0f0f4e73f5ecc7d02145b0e1fd096f5c3afb8a1d
- 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
  412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2
  5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803"
 
+only_for_archs="i686 x86_64"
 create_wrksrc=yes
 hostmakedepends="perl flex"
 makedepends="zlib-devel"
+# it's ok to build with current's -devel packages
+# although it might break the package during compiler updates
+#makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip=yes
 nopie=yes
 nodebug=yes
@@ -77,6 +81,7 @@ _mingw_headers() {
 	../mingw-w64-v${_mingw_version}/mingw-w64-headers/configure \
 		--prefix=${_sysroot} \
 		--host=${_target} \
+		--disable-werror \
 		--enable-secure-api \
 		--enable-sdk=all
 
@@ -94,6 +99,7 @@ _gcc_bootstrap() {
 
 	msg_normal "Building GCC bootsrap: ${_target}\n"
 
+	# not needed when using current's -devel packages
 	ln -sf ${wrksrc}/"gmp-${_gmp_version}" ${wrksrc}/"gcc-${_gcc_version}/gmp"
 	ln -sf ${wrksrc}/"mpc-${_mpc_version}" ${wrksrc}/"gcc-${_gcc_version}/mpc"
 	ln -sf ${wrksrc}/"mpfr-${_mpfr_version}" ${wrksrc}/"gcc-${_gcc_version}/mpfr"
@@ -105,6 +111,7 @@ _gcc_bootstrap() {
 		--prefix="/usr" \
 		--with-sysroot=${_sysroot} \
 		--target=${_target} \
+		--disable-werror \
 		--disable-nls \
 		--disable-multilib \
 		--disable-gcov \
@@ -214,7 +221,9 @@ _install_cross() {
 	(cd ${wrksrc}/"build-mingw-crt-${_target}" && DESTDIR="$DESTDIR" make install)
 	(cd ${wrksrc}/"build-mingw-winpthreads-${_target}" && DESTDIR="$DESTDIR" make install)
 
-	vlicense ${wrksrc}/"mingw-w64-v${_mingw_version}/COPYING" ZPL
+	# remove unnecessary stuff
+	rm -rf ${DESTDIR}/usr/share/
+	rm -rf ${DESTDIR}/usr/lib/libcc1*
 }
 
 do_install() {
@@ -237,7 +246,7 @@ do_clean() {
 }
 
 cross-i686-w64-mingw32_package() {
-	short_desc="Cross toolchain for Win32"
+	short_desc="Cross toolchain for Win32 (GCC ${_gcc_version})"
 	nostrip=yes
 	nopie=yes
 	nodebug=yes