diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
index 1707d41e7f1..134846c45f4 100644
--- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
+++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
@@ -1,11 +1,13 @@
 --- libiberty/Makefile.in	2016-08-05 17:07:27.540554328 +0200
 +++ libiberty/Makefile.in	2016-08-05 17:18:39.727540789 +0200
-@@ -112,7 +112,7 @@
+@@ -112,8 +112,8 @@
  
  INCDIR=$(srcdir)/$(MULTISRCTOP)../include
  
--COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@
-+COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) $(HDEFINES) @ac_libiberty_warn_cflags@
+-COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -I. -I$(INCDIR) \
+-               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_GNU_SOURCE
++COMPILE.c = $(CC) -c @DEFS@ $(CFLAGS) $(CPPFLAGS) -fPIC -I. -I$(INCDIR) \
++               $(HDEFINES) @ac_libiberty_warn_cflags@ -D_DEFAULT_SOURCE
  
  # Just to make sure we don't use a built-in rule with VPATH
  .c.$(objext):
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 7b6a119f880..a9430458efa 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -1,18 +1,18 @@
 # Template build file for 'gcc-multilib'
 only_for_archs="x86_64"
 _triplet="x86_64-unknown-linux-gnu"
-_majorver=4.9
+_majorver=6.2
 
 pkgname=gcc-multilib
-version=${_majorver}.4
+version=${_majorver}.1
 revision=2
 wrksrc="gcc-${version}"
 short_desc="The GNU C Compiler (multilib files)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
-distfiles="${GNU_SITE}/gcc/gcc-$version/gcc-$version.tar.bz2"
-checksum=6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092
+distfiles="https://repo.voidlinux.eu/distfiles/gcc-$version.tar.xz"
+checksum=a7addd2d4e42e66c3b56ced8baee5a11ef7fb577e23615a4f43877273eaf9409
 
 hostmakedepends="perl flex zip unzip"
 makedepends="zlib-devel libmpc-devel ppl-devel cloog-devel
@@ -40,6 +40,8 @@ do_configure() {
 	sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
 	# Do not run fixincludes
 	sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+	# hack! some configure tests for header files using "$CPP $CPPFLAGS"
+	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
 	./configure --prefix=/usr --mandir=/usr/share/man \
 		--infodir=/usr/share/info --libexecdir=/usr/lib \
@@ -81,13 +83,6 @@ do_install() {
 	rm -f ${DESTDIR}/usr/lib64
 }
 
-gcc-c++-multilib_package() {
-	depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver} libstdc++-devel-32bit>=${_majorver}"
-	short_desc="GCC C++ compiler (multilib files)"
-	pkg_install() {
-		vmove usr/include/c++
-	}
-}
 gcc-objc-multilib_package() {
 	depends="gcc-multilib>=${_majorver} gcc-objc>=${_majorver} libobjc-devel-32bit>=${_majorver}"
 	short_desc="The GNU Objective-C compiler (multilib files)"