diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 1c17250..e569eea 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST v1.0.tar.gz 594408 BLAKE2B a86782b5f3040d99c9b99340979585be3ab32b9cd18b717f2edec4fa8a64216056a9145fb378b22587a65b60955fe8d677bb2ef4665785cb0fe7a2cac32de5cc SHA512 4b3d8614413c45d743670d5f817ec060f2b1f62057958f035bccf8e00ae47b4163fff367d5f06bcececa005473bbbaaf5ddea44eab26d7eab88e96dde975c9b7
-EBUILD dxvk-1.0.ebuild 1377 BLAKE2B e0e3a789eeef61716046ea70fbc429af26fccd95c1f9d5a692397666dbc2c26e25cba448188ab9457df2985bf374c6823515eec7842daf6bfd3ae2e2a563cf8f SHA512 1410772bf0d7eb6d1a4fcebb2e9353fdb4173bfce57f952da1433e6e09638b785880560630f9f3ca63531295b89adafc0ae02785c5da4ee119d865ea0cae8cdc
-EBUILD dxvk-9999.ebuild 1377 BLAKE2B e0e3a789eeef61716046ea70fbc429af26fccd95c1f9d5a692397666dbc2c26e25cba448188ab9457df2985bf374c6823515eec7842daf6bfd3ae2e2a563cf8f SHA512 1410772bf0d7eb6d1a4fcebb2e9353fdb4173bfce57f952da1433e6e09638b785880560630f9f3ca63531295b89adafc0ae02785c5da4ee119d865ea0cae8cdc
+EBUILD dxvk-1.0-r1.ebuild 1797 BLAKE2B fbdcb98deddc8722b78249feda6d3985b7398c5fc17f604af78e4d552d3fe835ced916c02cd1676cb3031fd6c7fad214f0506428e0497d19bc85f91ffd3a0e54 SHA512 e049947e56984dda52e2313c230a0dc7f2551a445e224360f45bbd43945d61c65b93f3a88e1325aa0e82d070478f0973edba8d0eb2784b0ee853890a501983a7
+EBUILD dxvk-9999-r1.ebuild 1797 BLAKE2B fbdcb98deddc8722b78249feda6d3985b7398c5fc17f604af78e4d552d3fe835ced916c02cd1676cb3031fd6c7fad214f0506428e0497d19bc85f91ffd3a0e54 SHA512 e049947e56984dda52e2313c230a0dc7f2551a445e224360f45bbd43945d61c65b93f3a88e1325aa0e82d070478f0973edba8d0eb2784b0ee853890a501983a7
 MISC metadata.xml 339 BLAKE2B 2c3c82d9b14bca7f4b3b2d01aadad24d534c74201952505d3d579d636c6053cb8fdc3a91c269d500876af972015d48756c7ea4b5cec089c4a7c5c4fbfdc63d70 SHA512 f2694f77e348ae5cc9053b7380b0efe41dc4a82a4fd100e2a8c87a15c11452400581145938ed80816a2c9ec86e5cd4444b99b713c2404efa7225a0e39025c7be
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXHTe6QAKCRDPw5SX8bJu
-B5geAP9FyFWZbO/UZs0tuQ7zPZYrJIxCmFovro8NO4KTsZP8PQD9HOJjOh8aPsrJ
-/nqiIyYnKt5Nx5mZRE0EoWj04hpOnEU=
-=9Q1N
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXHeF5wAKCRDPw5SX8bJu
+B2rMAP4vMOK345K6XJJsgFATweRxUG7kl4KKHQVbi5NFFeeItgEAh3xBlqoS9+3f
+1/w4mp9om2McoVma3HIVlF1TbWP5wOw=
+=Upba
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dxvk/dxvk-1.0.ebuild b/app-emulation/dxvk/dxvk-1.0-r1.ebuild
similarity index 72%
rename from app-emulation/dxvk/dxvk-1.0.ebuild
rename to app-emulation/dxvk/dxvk-1.0-r1.ebuild
index 5e4dc38..e1e513a 100644
--- a/app-emulation/dxvk/dxvk-1.0.ebuild
+++ b/app-emulation/dxvk/dxvk-1.0-r1.ebuild
@@ -36,6 +36,21 @@ RDEPEND="
 	media-libs/vulkan-loader
 "
 
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib32/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
 multilib_src_configure() {
 	local bit="${MULTILIB_ABI_FLAG:8:2}"
 	local emesonargs=(
@@ -55,8 +70,12 @@ multilib_src_install() {
 	meson_src_install
 }
 
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
 pkg_postinst() {
 	elog "dxvk is installed, but not activated. You have to create DLL overrides"
 	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
-	elog "${EPREFIX}/usr/lib{32,64}/dxvk/bin/setup_dxvk.sh install."
+	elog "setup_dxvk.sh install --symlink."
 }
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999-r1.ebuild
similarity index 72%
rename from app-emulation/dxvk/dxvk-9999.ebuild
rename to app-emulation/dxvk/dxvk-9999-r1.ebuild
index 5e4dc38..e1e513a 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999-r1.ebuild
@@ -36,6 +36,21 @@ RDEPEND="
 	media-libs/vulkan-loader
 "
 
+src_prepare() {
+	default
+	sed -i "s|^basedir=.*$|basedir=\"${EPREFIX}\"|" setup_dxvk.sh || die
+	sed -i 's|"x64"|"usr/lib64/dxvk"|' setup_dxvk.sh || die
+	sed -i 's|"x32"|"usr/lib32/dxvk"|' setup_dxvk.sh || die
+
+	if ! use abi_x86_64; then
+		sed -i '|installFile "$win64_sys_path"|d' setup_dxvk.sh
+	fi
+
+	if ! use abi_x86_32; then
+		sed -i '|installFile "$win32_sys_path"|d' setup_dxvk.sh
+	fi
+}
+
 multilib_src_configure() {
 	local bit="${MULTILIB_ABI_FLAG:8:2}"
 	local emesonargs=(
@@ -55,8 +70,12 @@ multilib_src_install() {
 	meson_src_install
 }
 
+multilib_src_install_all() {
+	dobin setup_dxvk.sh
+}
+
 pkg_postinst() {
 	elog "dxvk is installed, but not activated. You have to create DLL overrides"
 	elog "in order to make use of it. To do so, set WINEPREFIX and execute"
-	elog "${EPREFIX}/usr/lib{32,64}/dxvk/bin/setup_dxvk.sh install."
+	elog "setup_dxvk.sh install --symlink."
 }