diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template
index a976afd89f5..718f7db0570 100644
--- a/srcpkgs/mingw-w64-binutils/template
+++ b/srcpkgs/mingw-w64-binutils/template
@@ -1,6 +1,7 @@
 # Template file for 'mingw-w64-binutils'
 pkgname=mingw-w64-binutils
 version=2.21.1
+revision=1
 distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2"
 build_style=custom-install
 short_desc="GNU binary utilities (mingw-w64 version)"
@@ -59,9 +60,25 @@ do_install()
 {
 	make DESTDIR=${DESTDIR} install
 
-	# Remove lib64 directory and it's only file: libiberty.a
-	rm -rf ${DESTDIR}/${_mingwprefix}/lib64
-
 	# Remove useless manpages
 	rm -rf ${DESTDIR}/${_mingwprefix}/share
+
+	# Remove lib64 directory and it's only file: libiberty.a
+	[ -d ${DESTDIR}/${_mingwprefix}/lib64 ] && \
+		rm -rf ${DESTDIR}/${_mingwprefix}/lib64
+
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		_mingwtriplet="${xbps_machine}-w64-mingw32"
+	else
+		_mingwtriplet="${xbps_machine}-w32-mingw32"
+	fi
+
+	# The mingw-w64 faq advises to create a symlink here
+	if [ "${xbps_machine}" = "x86_64" ]; then
+		cd ${DESTDIR}/${_mingwprefix}/${_mingwtriplet} && \
+		ln -sf lib lib64
+	fi
+
+	# The mingw-w64 faq advises to create a symlink here
+	cd ${DESTDIR}/${_mingwprefix} && ln -sf ${_mingwtriplet} mingw
 }