diff --git a/common/build-profiles/armv6l-musl.sh b/common/build-profiles/armv6l-musl.sh
index b34a926985..7dcb03e3a4 100644
--- a/common/build-profiles/armv6l-musl.sh
+++ b/common/build-profiles/armv6l-musl.sh
@@ -1,3 +1,3 @@
 XBPS_TARGET_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_TARGET_CXXFLAGS="$XBPS_TARGET_CFLAGS"
-XBPS_TRIPLET="armv6l-unknown-linux-musleabi"
+XBPS_TRIPLET="armv6l-linux-musleabihf"
diff --git a/common/cross-profiles/armv6hf-musl.sh b/common/cross-profiles/armv6hf-musl.sh
index 18aa5a7a28..ddb837dd67 100644
--- a/common/cross-profiles/armv6hf-musl.sh
+++ b/common/cross-profiles/armv6hf-musl.sh
@@ -1,6 +1,6 @@
 # Cross build profile for ARM EABI5 Hard Float and Musl libc.
 
 XBPS_TARGET_ARCH="armv6l-musl"
-XBPS_CROSS_TRIPLET="arm-linux-musleabi"
+XBPS_CROSS_TRIPLET="arm-linux-musleabihf"
 XBPS_CROSS_CFLAGS="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 XBPS_CROSS_CXXFLAGS="$XBPS_CROSS_CFLAGS"
diff --git a/srcpkgs/cross-arm-linux-musleabi-libc b/srcpkgs/cross-arm-linux-musleabi-libc
deleted file mode 120000
index a8bc35012b..0000000000
--- a/srcpkgs/cross-arm-linux-musleabi-libc
+++ /dev/null
@@ -1 +0,0 @@
-cross-arm-linux-musleabi
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabihf-libc b/srcpkgs/cross-arm-linux-musleabihf-libc
new file mode 120000
index 0000000000..faba56afd5
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-musleabihf-libc
@@ -0,0 +1 @@
+cross-arm-linux-musleabihf
\ No newline at end of file
diff --git a/srcpkgs/cross-arm-linux-musleabi/files/gcc-4.9.2-musl.diff b/srcpkgs/cross-arm-linux-musleabihf/files/gcc-4.9.2-musl.diff
similarity index 100%
rename from srcpkgs/cross-arm-linux-musleabi/files/gcc-4.9.2-musl.diff
rename to srcpkgs/cross-arm-linux-musleabihf/files/gcc-4.9.2-musl.diff
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabihf/template
similarity index 93%
rename from srcpkgs/cross-arm-linux-musleabi/template
rename to srcpkgs/cross-arm-linux-musleabihf/template
index e8ee48760c..2105be2c83 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,11 +1,11 @@
-# Template build file for 'cross-arm-linux-musleabi'
+# Template build file for 'cross-arm-linux-musleabihf'
 #
 _binutils_version=2.25
 _gcc_version=4.9.2
-_musl_version=1.1.6
+_musl_version=1.1.9
 _linux_version=3.18.5
 
-_triplet=arm-linux-musleabi
+_triplet=arm-linux-musleabihf
 _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
@@ -26,7 +26,7 @@ checksum="
  22defc65cfa3ef2a3395faaea75d6331c6e62ea5dfacfed3e2ec17b08c882923
  2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
  e4442436e59c74169e98d38d2e2a434c7b73f8eda0aa8f20e454eaf52270fc90
- 5a0160c55c540d5b90158617a57647f1b03209f58d9ee70dbce19d1115b4f1b4"
+ 00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e"
 
 lib32disabled=yes
 nocross=yes
@@ -206,16 +206,15 @@ do_install() {
 	rm -rf ${DESTDIR}/${_sysroot}/usr/{sbin,share,libexec}
 	rm -f ${DESTDIR}/${_sysroot}/libexec
 	rm -f ${DESTDIR}/${_sysroot}/lib/*.py
+	rm -rf ${DESTDIR}/${_sysroot}/{bin,sbin,lib}
 }
 
-cross-arm-linux-musleabi-libc_package() {
+cross-arm-linux-musleabihf-libc_package() {
 	short_desc+=" - libc files"
 	noarch=yes
-	noverifydeps=yes
+	noshlibprovides=yes
+	noverifyrdeps=yes
 	pkg_install() {
-		vmove usr/${_triplet}
-		mkdir -p ${DESTDIR}/usr/${_triplet}/usr/
-		mv ${PKGDESTDIR}/usr/${_triplet}/usr/bin ${DESTDIR}/usr/${_triplet}/usr
-
+		vmove ${_sysroot}
 	}
 }