diff --git a/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7 b/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7
new file mode 120000
index 00000000000..91475a64be9
--- /dev/null
+++ b/srcpkgs/cross-arm-linux-gnueabihf7/cross-arm-linux-gnueabihf7
@@ -0,0 +1 @@
+cross-arm-linux-gnueabihf7
\ No newline at end of file
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch b/srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-xattr-compat-hack.patch
similarity index 100%
rename from srcpkgs/cross-armv7l-linux-gnueabihf/files/glibc-2.18-xattr-compat-hack.patch
rename to srcpkgs/cross-arm-linux-gnueabihf7/files/glibc-2.18-xattr-compat-hack.patch
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf7/template
similarity index 97%
rename from srcpkgs/cross-armv7l-linux-gnueabihf/template
rename to srcpkgs/cross-arm-linux-gnueabihf7/template
index 0e35ea76360..ed8bde16e7e 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf7/template
@@ -1,11 +1,11 @@
-# Template build file for 'cross-armv7l-linux-gnueabihf'
+# Template build file for 'cross-arm-linux-gnueabihf7'
 #
 _binutils_version=2.24
 _gcc_version=4.9.1
 _glibc_version=2.19
 _linux_version=3.10.6
 
-_triplet=armv7l-linux-gnueabihf
+_triplet=arm-linux-gnueabihf7
 _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _CROSS_SYSROOT="/usr/${_triplet}"
@@ -31,6 +31,8 @@ checksum="
 lib32disabled=yes
 nocross=yes
 create_wrksrc=yes
+replaces="cross-armv7l-linux-gnueabihf>=0 cross-armv7l-linux-gnueabihf-libc>=0"
+
 hostmakedepends="perl flex"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel"
 depends="${pkgname}-libc-${version}_${revision}"
@@ -283,7 +285,7 @@ do_clean() {
 	rm -rf /usr/libexec/gcc/${_triplet}
 }
 
-cross-armv7l-linux-gnueabihf-libc_package() {
+cross-arm-linux-gnueabihf7-libc_package() {
 	short_desc+=" - glibc files"
 	noarch=yes
 	nostrip=yes
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf-libc b/srcpkgs/cross-armv7l-linux-gnueabihf-libc
deleted file mode 120000
index 3833a4b58bd..00000000000
--- a/srcpkgs/cross-armv7l-linux-gnueabihf-libc
+++ /dev/null
@@ -1 +0,0 @@
-cross-armv7l-linux-gnueabihf
\ No newline at end of file