diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 37885ce5a1..aaa859b0c1 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-aarch64-linux-musl'
 #
 _binutils_version=2.25
-_gcc_version=4.9.2
-_musl_version=1.1.8
+_gcc_version=4.9.3
+_musl_version=1.1.10
 _linux_version=3.18.5
 
 _triplet=aarch64-linux-musl
@@ -10,8 +10,8 @@ _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.17
-revision=2
+version=0.20
+revision=1
 short_desc="Cross toolchain for ARM64 LE target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -23,10 +23,9 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90
- fa928506415b9c555977daaf874c190eaf7fbbd16028cc5c5f33a00a83227813"
-
+ 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c"
 lib32disabled=yes
 nocross=yes
 nodebug=yes
@@ -70,7 +69,7 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+	_apply_patch ${FILESDIR}/gcc-4.7.2-musl.diff
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -215,6 +214,7 @@ cross-aarch64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	noarch=yes
 	noshlibprovides=yes
+	noverifyrdeps=yes
 	pkg_install() {
 		vmove ${_sysroot}
 	}
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 9a240dd93c..771a30cf3c 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-arm-linux-musleabihf'
 #
 _binutils_version=2.25
-_gcc_version=4.9.2
-_musl_version=1.1.9
+_gcc_version=4.9.3
+_musl_version=1.1.10
 _linux_version=3.18.6
 
 _triplet=arm-linux-musleabihf
@@ -11,8 +11,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.17
-revision=4
+version=0.20
+revision=1
 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -24,9 +24,9 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
- 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e"
+ 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c"
 
 lib32disabled=yes
 nocross=yes
@@ -71,7 +71,7 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+	_apply_patch -p1 ${FILESDIR}/gcc-4.7.2-musl.diff
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 3aefced028..c8c8769afb 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-armv7l-linux-musleabihf'
 #
 _binutils_version=2.25
-_gcc_version=4.9.2
-_musl_version=1.1.9
+_gcc_version=4.9.3
+_musl_version=1.1.10
 _linux_version=3.18.6
 
 _triplet=armv7l-linux-musleabihf
@@ -11,8 +11,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.17
-revision=4
+version=0.20
+revision=1
 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -24,9 +24,9 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
- 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e"
+ 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c"
 
 lib32disabled=yes
 nocross=yes
@@ -71,7 +71,7 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+	_apply_patch -p1 ${FILESDIR}/gcc-4.7.2-musl.diff
 
 	msg_normal "Building cross gcc bootstrap\n"
 
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 0e7ae80886..abac4938f1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-i686-linux-musl'
 #
 _binutils_version=2.25
-_gcc_version=4.9.2
-_musl_version=1.1.6
+_gcc_version=4.9.3
+_musl_version=1.1.10
 _linux_version=3.18.6
 
 _triplet=i686-linux-musl
@@ -10,8 +10,8 @@ _sysroot="/usr/${_triplet}"
 _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
-version=0.17
-revision=6
+version=0.20
+revision=1
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -23,9 +23,9 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
- 5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4"
+ 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c"
 
 lib32disabled=yes
 nocross=yes
@@ -71,7 +71,7 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+	_apply_patch -p1 ${FILESDIR}/gcc-4.7.2-musl.diff
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -214,15 +214,15 @@ do_install() {
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -f ${DESTDIR}/${_sysroot}/libexec
 	rm -f ${DESTDIR}/${_sysroot}/lib/*.py
+	rm -f ${DESTDIR}/${_sysroot}/{bin,sbin,lib}
 }
 
 cross-i686-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	noarch=yes
 	noverifydeps=yes
+	noshlibprovides=yes
 	pkg_install() {
-		vmove usr/${_triplet}
-		mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
-		mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr
+		vmove ${_sysroot}
 	}
 }
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 20bc3ce407..944c98c51f 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-mips-linux-musl'
 #
 _binutils_version=2.24
-_gcc_version=4.9.2
-_musl_version=1.1.8
+_gcc_version=4.9.3
+_musl_version=1.1.10
 _linux_version=3.10.6
 
 _triplet=mips-linux-musl
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.17
-revision=3
+version=0.20
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -24,9 +24,9 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf
- fa928506415b9c555977daaf874c190eaf7fbbd16028cc5c5f33a00a83227813"
+ 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c"
 
 lib32disabled=yes
 nocross=yes
@@ -71,7 +71,7 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+	_apply_patch ${FILESDIR}/gcc-4.7.2-musl.diff
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -214,6 +214,7 @@ do_install() {
 cross-mips-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	noarch=yes
+	noverifyrdeps=yes
 	noshlibprovides=yes
 	pkg_install() {
 		vmove ${_sysroot}
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 555dcddcb5..9d299f20d3 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,16 +1,16 @@
 # Template build file for 'cross-x86_64-linux-musl'
 #
 _binutils_version=2.25
-_gcc_version=4.9.2
-_musl_version=1.1.6
+_gcc_version=4.9.3
+_musl_version=1.1.10
 _linux_version=3.18.6
 
 _triplet=x86_64-linux-musl
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.17
-revision=4
+version=0.20
+revision=1
 short_desc="Cross toolchain for x86_64 with musl"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -22,9 +22,9 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
- 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
+ 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e
  c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5
- 5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4"
+ 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c"
 
 lib32disabled=yes
 nocross=yes
@@ -70,7 +70,7 @@ _gcc_bootstrap() {
 	[ -f ${wrksrc}/.gcc_bootstrap_done ] && return 0
 
 	cd ${wrksrc}/gcc-${_gcc_version}
-	_apply_patch -p1 ${FILESDIR}/gcc-${_gcc_version}-musl.diff
+	_apply_patch -p1 ${FILESDIR}/gcc-4.7.2-musl.diff
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -213,15 +213,15 @@ do_install() {
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -f ${DESTDIR}/${_sysroot}/libexec
 	rm -f ${DESTDIR}/${_sysroot}/lib/*.py
+	rm -f ${DESTDIR}/${_sysroot}/{bin,sbin,lib}
 }
 
 cross-x86_64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
 	noarch=yes
 	noverifydeps=yes
+	noshlibprovides=yes
 	pkg_install() {
-		vmove usr/${_triplet}
-		mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
-		mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr
+		vmove ${_sysroot}
 	}
 }