diff --git a/nongnu/packages/wine.scm b/nongnu/packages/wine.scm
index 719092d..1ba17ef 100644
--- a/nongnu/packages/wine.scm
+++ b/nongnu/packages/wine.scm
@@ -79,7 +79,8 @@ automatically.  It also allows the installation of missing nonfree DLLs and
 tweaking of various Wine settings.")
     (license license:lgpl2.1)))
 
-(define-public dxvk-1.7 ; Upstream Guix dxvk does not build anymore because of missing mingw compiler.
+;; Upstream Guix dxvk does not build anymore because of missing mingw compiler.
+(define-public dxvk-1.7 ; TODO: Can we remove this in favour of `dxvk' without breaking `guix pull'?
   (package
     (name "dxvk")
     (version "1.7.3")
@@ -136,3 +137,61 @@ allows running complex 3D applications with high performance using Wine.
 Use @command{setup_dxvk} to install the required libraries to a Wine prefix.")
     (supported-systems '("i686-linux" "x86_64-linux"))
     (license license:zlib)))
+
+(define-public dxvk
+  (package
+    (name "dxvk")
+    (version "1.8")
+    (home-page "https://github.com/doitsujin/dxvk/")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/doitsujin/dxvk/releases/download/v"
+                    version "/dxvk-" version ".tar.gz") )
+              (sha256
+               (base32
+                "0vj7v9dhaw18ymzl0z3155g18v92k444fi37jw9m0zxcjk27lkz8"))))
+    (build-system copy-build-system)
+    (arguments
+     `(#:install-plan
+       `(,@,(if (string=? (or (%current-target-system) (%current-system))
+                          "x86_64-linux")
+                '(list '("x64" "share/dxvk/lib"))
+                ''())
+         ("x32" ,,(if (string=? (or (%current-target-system) (%current-system))
+                                "i686-linux")
+                       "share/dxvk/lib"
+                       "share/dxvk/lib32"))
+         ("setup_dxvk.sh" "bin/setup_dxvk"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'fix-setup
+           (lambda* (#:key inputs outputs system #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (libs "../share/dxvk")
+                    (wine (assoc-ref inputs "wine")))
+               (substitute* (string-append out "/bin/setup_dxvk")
+                 (("wine=\"wine\"")
+                  (string-append "wine=" wine "/bin/wine"))
+                 (("wine64=\"wine64\"")
+                  (string-append "wine64=" wine "/bin/wine64"))
+                 (("wineboot=\"wineboot\"")
+                  (string-append "wineboot=" wine "/bin/wineboot"))
+                 (("\"\\$wine_path/\\$wine\"")
+                  "\"$wine_path/wine\"")
+                 (("x32") (if (string=? system "x86_64-linux")
+                              (string-append libs "/lib32")
+                              (string-append libs "/lib")))
+                 (("x64") (string-append libs "/lib")))))))))
+    (inputs
+     `(("wine" ,(match (or (%current-target-system)
+                           (%current-system))
+                  ("x86_64-linux" wine64-staging)
+                  (_ wine-staging)))))
+    (synopsis "Vulkan-based D3D9, D3D10 and D3D11 implementation for Wine")
+    (description "A Vulkan-based translation layer for Direct3D 9/10/11 which
+allows running complex 3D applications with high performance using Wine.
+
+Use @command{setup_dxvk} to install the required libraries to a Wine prefix.")
+    (supported-systems '("i686-linux" "x86_64-linux"))
+    (license license:zlib)))