diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 03c19eec3..43ba3e398 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -6,15 +6,15 @@ AUX 1.6.1-add_compiler_flags.patch 2745 BLAKE2B b664a09dc698c24b0d699b1b717c33fd
 AUX flags.patch 1400 BLAKE2B c69951eddea7b94836e9d64b39870395c4eb54dcfff31fb9ff9eafa801d989acddcf738802bbc3600a871053546dc5f641726f7e75cfdb9f101973aebd2b3571 SHA512 fd4a053775a4ab7b4df24da38ba602a5e8d43a75676bf3e870a82dd4f4e3bcf228e043139604c95941b09086ecd21887a8eaf81f2229d00abb47fdc83419284c
 DIST dxvk-1.6.1.tar.gz 894553 BLAKE2B a45f905f33b255beed65daebbb946b36c28d00dc4d3830e46de342f16d95541361a31243e6ce3e8cde3b2c7297dd2b1044aa61955f1803b8bfb34ec83367c2a9 SHA512 0f3cb7096643d1bcb1db51696824c8ca16720adfe6894392122b21f400cfa416e79eb74cdcc46d1a63a276697d324324d7657afb70b9490e22e6792643fc5805
 DIST dxvk-1.6.tar.gz 892463 BLAKE2B 84d1ca0b42b9b63c5efa15d284ffedd76d4f5c09a1ca3e51971d36d68f0a5346f4bf3e5ee119a90fdbf489a3e21137e9d981710cb2b33b4b6a195f941baefa15 SHA512 5b1ba21515e5f7a75baba1e182a0b15285712c2a6e8946fcc0eadb82b64d43122e1c211304af2c890e368098fd2a69d174f86c05f9b0de0b417b0f2390d4a0ca
-EBUILD dxvk-1.6.1-r1.ebuild 4953 BLAKE2B ca01e3f4baab173d633234e7b1598ddc9c850200aae89bb861110cc5c5a6def3aab71c63087d64d040d885a82ec7752bd6bf93c0b74486f26ed688b2fe300a1c SHA512 2b218e0ff5b682777798e4010d77c5ea4786130cba4211020d9604f799ceb6dbfc07d15f40c7e139bffc3a5226f905233ff70ff71bb791bb900d7bd21c1e5ce8
+EBUILD dxvk-1.6.1-r1.ebuild 5021 BLAKE2B 98411a4a22e77fa8d06caefd73b2531ebec01894eef063a37154b24d321d82e39ea3992dd2f738683c9d74811f482eef27b6f1402382f04244570cfe89b8487d SHA512 d71570ffde6d098604b40867f66186930463aed9112d2aafbd22b40bd85a423a4e738d5e8b9e787212a65593ba7bb2875f50a113bc9dd33f13df10dc0ee2fd7d
 EBUILD dxvk-1.6.1.ebuild 2975 BLAKE2B 0060d4b28590fe43b4c2aed3913d10fbd5055b67671c00d920c61aa4541334e454c18578c6bfd8661932dd44d174675886d4dbc2f5ba311147be10bb25f02b87 SHA512 1019c3376b74b14f6834d4fef7f9d36e60ef1e09801c7de598fcc7dceb5cd09c929af2b527c516e88ab7dbcd67275749a690df7a95af670a3256b65429dded4e
 EBUILD dxvk-1.6.ebuild 2381 BLAKE2B c77d62c0dc71ec4f78fe7d5dc15435b123bfd97073dd05d1fbfadf69c84bec940bbe7fcdba2cfff9a841f00a5079f9ddc5651991893828072ea76ea9554b2a8d SHA512 b36a83d0065d8216a01ec6a1b50bc842acbac9f25b0315bbf250df2cb6413dca709464ef9e081ea4fa7c0ce41cf357abc19793c9925db16a319ecc4387fdd844
 EBUILD dxvk-9999-r3.ebuild 2975 BLAKE2B 0060d4b28590fe43b4c2aed3913d10fbd5055b67671c00d920c61aa4541334e454c18578c6bfd8661932dd44d174675886d4dbc2f5ba311147be10bb25f02b87 SHA512 1019c3376b74b14f6834d4fef7f9d36e60ef1e09801c7de598fcc7dceb5cd09c929af2b527c516e88ab7dbcd67275749a690df7a95af670a3256b65429dded4e
 MISC metadata.xml 643 BLAKE2B 0b5aa604f15a049ffce213c45e4731da24bc903d54dfce84692be92f106a271fde885ada19f5a44781452423178b1361e9fe2152cc4c689dbd4fe8e04f241ade SHA512 49f429099195f87d22cf8a5a549074b881aed6b7ff1f76427497f730137d002ee3d8b0a6d1cf4322588e8d3a4d61d9387d72e668eab8b9fa2e0cebb17f942802
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp5tagAKCRDPw5SX8bJu
-B7NoAP9ioBkyZzCc3UivyTFclV1x8i1mv8IWHi8D3K4dhJ8e7gD/coFKFNW4Sl9a
-dN4pFCv+lnefFzF6aTyKcSlowLqbCt4=
-=3Yod
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXp8RYgAKCRDPw5SX8bJu
+BzpPAP44s7nuoY95m9ztBtfVj0Q5G2jVr5XDFR9bQ2w2yEgx7AD8CHcpL7V+tJYY
+KXwNR1AgsF+O+QqIM+Dd2hV3/23X9ak=
+=O9mz
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild b/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild
index fc9112941..14cc3a068 100644
--- a/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild
+++ b/app-emulation/dxvk/dxvk-1.6.1-r1.ebuild
@@ -24,7 +24,7 @@ if [[ "${PV}" == "9999" ]]; then
 else
 	KEYWORDS=""
 fi
-IUSE="+d3d9 +d3d10 +d3d11 +dxgi +mingw video_cards_nvidia test winegcc"
+IUSE="+d3d9 +d3d10 +d3d11 debug +dxgi +mingw video_cards_nvidia test winegcc"
 REQUIRED_USE="^^ ( mingw winegcc )"
 
 DEPEND="
@@ -145,7 +145,7 @@ multilib_src_configure() {
 		--bindir="$(get_libdir)/dxvk"
 		--cross-file="${S}/${buildfile}"
 		--buildtype="release"
-		--strip
+		$(usex debug "" "--strip")
 		$(meson_use d3d9 "enable_d3d9")
 		$(meson_use d3d10 "enable_d3d10")
 		$(meson_use d3d11 "enable_d3d11")
@@ -165,8 +165,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	# Remove static libraries.
-	find . -name '*.a' -delete || die
+	# The .a files are needed during the install phase.
+	use mingw && find "${D}" -name '*.a' -delete -print
 
 	dobin setup_dxvk.sh