diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 9fe1a3a..10fe3d4 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -11,13 +11,13 @@ DIST dxvk-1.7.tar.gz 899679 BLAKE2B 3e382520c136ebdb5277289ba2ba6586dbd861074f1c
 EBUILD dxvk-1.6.1-r1.ebuild 5458 BLAKE2B 26cf74765a78a1fc91652538eaff50e65696e4fbc6ca781cdb14642aaf9fee1cfd8a8b30e5be08c6c45eee4d8092d5cbeb2acb9f5b1402c1224b1a0a643b39bb SHA512 f1d6dea813e702d700568f5ea54b736f01efbb920b58b93a51b4aa76e4cf386dbc8ecf2ef5ddeca48552575f511939dc8a85942e6acedce7ea6fd926b0cd3639
 EBUILD dxvk-1.6.1.ebuild 2970 BLAKE2B 4eb3ed4de391e7bc3aea0b8f2789728f88f43cda7f4da00a6dc7f10308716418bab30c0f235ac4cf048ef887f2100eb4b131be02be0a46817b456a6e05c9db74 SHA512 2915110c781a80e70b1568868c03370804d50954885d7d0015d8bbd5517abcc1ec0bed8cb5f197a3f5d671c6cb5c282ce23fe33c4d179a6ee449b1aaf62ecec7
 EBUILD dxvk-1.6.ebuild 3014 BLAKE2B f510a47962b19ab5854d8a5f5e36a2200d021f6783aa05f8222cce1d05006b97130abf186bda937236c73cc994c043d627938035d9363030605d0c082f66638c SHA512 43e80f111f51a9084b09064178bebb437b2c0931b4f65ed665a837805b6bb5dcc5a2868b05bd103fe864f6f9de59829c4c9e21734a780c4a0913b4176c7e8757
-EBUILD dxvk-1.7.ebuild 5045 BLAKE2B cb57f52c9fcf0a8347a8762da40f7784f197e1f0fe245cbdf0a71957e552cf39f5a7c1055cd87ab0d81bec9a1a881861687c2fccaa440007e8439350d2f0fc0f SHA512 eaed28afe937d753aad4cc54a75c69b5eb5b87cb6f7b04a3f9bb6a4fb1c3f08271d79449129a4037011aba06187f39246408ae0ed2608292bf1d486cc5698c6b
-EBUILD dxvk-9999-r4.ebuild 5045 BLAKE2B cb57f52c9fcf0a8347a8762da40f7784f197e1f0fe245cbdf0a71957e552cf39f5a7c1055cd87ab0d81bec9a1a881861687c2fccaa440007e8439350d2f0fc0f SHA512 eaed28afe937d753aad4cc54a75c69b5eb5b87cb6f7b04a3f9bb6a4fb1c3f08271d79449129a4037011aba06187f39246408ae0ed2608292bf1d486cc5698c6b
+EBUILD dxvk-1.7.ebuild 4945 BLAKE2B 71debcbf260cf064ad3cdb1bae6ccca416fb147ddaa16cfe800461fd3279f0e10ba1f400c577dd0d841865ce74a4d8a54c6e341beed894385985eba940ec4d8f SHA512 cd35136ffe32e5caf5407c8137629d2cbc0ef1133a34b643e91f339f77e4eb786e419f01bd0bedb3143a583cb63163141e4e035c3ce67c26c959f0927234431f
+EBUILD dxvk-9999-r4.ebuild 4945 BLAKE2B 71debcbf260cf064ad3cdb1bae6ccca416fb147ddaa16cfe800461fd3279f0e10ba1f400c577dd0d841865ce74a4d8a54c6e341beed894385985eba940ec4d8f SHA512 cd35136ffe32e5caf5407c8137629d2cbc0ef1133a34b643e91f339f77e4eb786e419f01bd0bedb3143a583cb63163141e4e035c3ce67c26c959f0927234431f
 MISC metadata.xml 643 BLAKE2B 6e4968ea2dddea57b8079e56f3c7e5f3f478a5d017d4d238d3b2326b593bb461a74ef77270bf659fecec25c564156617e287ab8a247e8b040c07e5b829e70898 SHA512 0c71cc5589839c365703bb1938fd3360adf985875a669239a45abb8f25f517330b8e72895a18db61b076eed7e71e1a804016d0d01afeadc5650340505c30eb74
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXsATBgAKCRDPw5SX8bJu
-Bw3pAP9o6za8r2bbQ+daogejUlFnlU5HrEtp63X8FOgkVMB6tAD/TGR+fL9AtUWs
-7sxKDe3/aHhtV+5Ap/RyI6PsMdfMDtc=
-=9Ax7
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXsGlmgAKCRDPw5SX8bJu
+BxtVAP97HAUOWTMZBPoDiJ0oh216Abwwfc4wLgXJLA54hcRHyQEAignk2ucB9uVx
+Zk/QzAHpd+LLiMPK+Qu0FLaTaFtNySc=
+=s6G/
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dxvk/dxvk-1.7.ebuild b/app-emulation/dxvk/dxvk-1.7.ebuild
index 16a1972..add733d 100644
--- a/app-emulation/dxvk/dxvk-1.7.ebuild
+++ b/app-emulation/dxvk/dxvk-1.7.ebuild
@@ -63,20 +63,18 @@ pkg_pretend () {
 				! has_version -b "${cat}/gcc" ||
 				[[ "${thread_model}" != "posix" ]]; then
 			eerror "The ${cat} toolchain is not properly installed."
-			eerror "Make sure to install ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\""
-			eerror "and ${cat}/mingw64-runtime with USE=\"libraries\"."
-			elog "See <https://wiki.gentoo.org/wiki/Mingw> for more information."
+			eerror "Make sure to install ${cat}/mingw64-runtime with USE=\"libraries\""
+			eerror "and ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\"."
+			eerror "See <https://wiki.gentoo.org/wiki/DXVK> for more information."
 			einfo "In short:"
-			einfo "echo '~${cat}/mingw64-runtime-7.0.0 ~amd64' >> \\"
-			einfo "    /etc/portage/package.accept_keywords/mingw"
-			einfo "crossdev --stable --target ${cat}"
-			einfo "echo 'EXTRA_ECONF=\"--enable-threads=posix\"' >> \\"
-			einfo "    /etc/portage/env/mingw-gcc.conf"
+			einfo "crossdev --stable --libc \"~7.0.0\" --target ${cat}"
 			einfo "echo '${cat}/gcc mingw-gcc.conf' >> \\"
 			einfo "    /etc/portage/package.env/mingw"
+			einfo "echo 'EXTRA_ECONF=\"--enable-threads=posix\"' >> \\"
+			einfo "    /etc/portage/env/mingw-gcc.conf"
 			einfo "echo '${cat}/mingw64-runtime libraries' >> \\"
 			einfo "    /etc/portage/package.use/mingw"
-			einfo "emerge --oneshot ${cat}/gcc ${cat}/mingw64-runtime"
+			einfo "emerge --oneshot ${cat}/mingw64-runtime ${cat}/gcc"
 
 			einfo "Alternatively you can install app-emulation/dxvk-bin from the “guru” repo."
 			die "${cat} toolchain is not properly installed."
diff --git a/app-emulation/dxvk/dxvk-9999-r4.ebuild b/app-emulation/dxvk/dxvk-9999-r4.ebuild
index 16a1972..add733d 100644
--- a/app-emulation/dxvk/dxvk-9999-r4.ebuild
+++ b/app-emulation/dxvk/dxvk-9999-r4.ebuild
@@ -63,20 +63,18 @@ pkg_pretend () {
 				! has_version -b "${cat}/gcc" ||
 				[[ "${thread_model}" != "posix" ]]; then
 			eerror "The ${cat} toolchain is not properly installed."
-			eerror "Make sure to install ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\""
-			eerror "and ${cat}/mingw64-runtime with USE=\"libraries\"."
-			elog "See <https://wiki.gentoo.org/wiki/Mingw> for more information."
+			eerror "Make sure to install ${cat}/mingw64-runtime with USE=\"libraries\""
+			eerror "and ${cat}/gcc with EXTRA_ECONF=\"--enable-threads=posix\"."
+			eerror "See <https://wiki.gentoo.org/wiki/DXVK> for more information."
 			einfo "In short:"
-			einfo "echo '~${cat}/mingw64-runtime-7.0.0 ~amd64' >> \\"
-			einfo "    /etc/portage/package.accept_keywords/mingw"
-			einfo "crossdev --stable --target ${cat}"
-			einfo "echo 'EXTRA_ECONF=\"--enable-threads=posix\"' >> \\"
-			einfo "    /etc/portage/env/mingw-gcc.conf"
+			einfo "crossdev --stable --libc \"~7.0.0\" --target ${cat}"
 			einfo "echo '${cat}/gcc mingw-gcc.conf' >> \\"
 			einfo "    /etc/portage/package.env/mingw"
+			einfo "echo 'EXTRA_ECONF=\"--enable-threads=posix\"' >> \\"
+			einfo "    /etc/portage/env/mingw-gcc.conf"
 			einfo "echo '${cat}/mingw64-runtime libraries' >> \\"
 			einfo "    /etc/portage/package.use/mingw"
-			einfo "emerge --oneshot ${cat}/gcc ${cat}/mingw64-runtime"
+			einfo "emerge --oneshot ${cat}/mingw64-runtime ${cat}/gcc"
 
 			einfo "Alternatively you can install app-emulation/dxvk-bin from the “guru” repo."
 			die "${cat} toolchain is not properly installed."