diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template
index a13382c7bbb..ddc8dca3b81 100644
--- a/srcpkgs/mingw-w64-crt/template
+++ b/srcpkgs/mingw-w64-crt/template
@@ -36,7 +36,7 @@ else
 	_multilib_args="--enable-lib32 --disable-lib64"
 fi
 
-strip_cmd=${_mingwtriplet}-strip
+strip_cmd=${_mingwprefix}/bin/${_mingwtriplet}-strip
 
 do_build()
 {
@@ -46,7 +46,9 @@ do_build()
 
 	cd ${wrksrc}/../$_shortname-v$_majversion-$_snapshot/$pkgname && \
 		./configure --prefix=${_mingwprefix} --with-sysroot=${_mingwprefix} \
-			--host=${_mingwtriplet} ${_multilib_args} --bindir=${_mingwprefix}/bin
+			--host=${_mingwtriplet} ${_multilib_args} \
+			--bindir=${_mingwprefix}/bin --libdir=${_mingwprefix}/lib \
+			--libexecdir=${_mingwprefix}/lib
             
 	make ${makejobs}
 	
@@ -55,6 +57,13 @@ do_build()
 
 do_install()
 {
+	# This path setting is necessary so that it finds ${_mingwprefix}-ranlib
+	unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
+	local SAVEDPATH=$PATH
+	export PATH="/opt/bin:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+
 	cd ${wrksrc}/../$_shortname-v$_majversion-$_snapshot/$pkgname && \
 		make DESTDIR=${DESTDIR} install
+
+	export PATH=$SAVEDPATH
 }
diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template
index 271e69c7dfd..478959f3422 100644
--- a/srcpkgs/mingw-w64-gcc/template
+++ b/srcpkgs/mingw-w64-gcc/template
@@ -26,7 +26,10 @@ Add_dependency run mpc
 Add_dependency run mpfr
 Add_dependency run zlib
 
-Add_dependency build gcc-multilib
+if [ "${xbps_machine}" = "x86_64" ]; then
+	Add_dependency build gcc-multilib
+fi
+
 Add_dependency build flex
 Add_dependency build gawk