diff --git a/anda/system/wine-dxvk/anda.hcl b/anda/system/wine-dxvk/anda.hcl
new file mode 100644
index 0000000000..7f713b90ec
--- /dev/null
+++ b/anda/system/wine-dxvk/anda.hcl
@@ -0,0 +1,11 @@
+project pkg {
+        arches = ["x86_64", "i386"]
+	rpm {
+		spec = "wine-dxvk.spec"
+		extra_repos = ["https://repos.fyralabs.com/terrarawhide-mesa"]
+	}
+	labels {
+	    mock = 1
+	    subrepo = "extras"
+	}
+}
diff --git a/anda/system/wine-dxvk/update.rhai b/anda/system/wine-dxvk/update.rhai
new file mode 100644
index 0000000000..bd21925681
--- /dev/null
+++ b/anda/system/wine-dxvk/update.rhai
@@ -0,0 +1,8 @@
+rpm.version(gh("doitsujin/dxvk");
+if rpm.changed {
+    let json = get("https://api.github.com/repos/doitsujin/dxvk/contents/subprojects").json_arr();
+    rpm.global("libdisplay_commit", json[0].sha);
+    let rawfile = get("https://gitlab.freedesktop.org/emersion/libdisplay-info/-/raw/main/meson.build?ref_type=heads");
+    let v = find("version: '([\\d.]+....)'", rawfile, 1);
+    rpm.global("libdisplay_ver", v);
+}
diff --git a/anda/system/wine-dxvk/wine-dxvk.spec b/anda/system/wine-dxvk/wine-dxvk.spec
new file mode 100644
index 0000000000..9da1bbed54
--- /dev/null
+++ b/anda/system/wine-dxvk/wine-dxvk.spec
@@ -0,0 +1,228 @@
+# Compatibility package for Terra WINE
+%global debug_package %{nil}
+%{?mingw_package_header}
+
+%global libdisplay_ver 0.3.0-dev
+%global libdisplay_commit 275e6459c7ab1ddd4b125f28d0440716e4888078
+%global libdisplay_shortcommit %(c=%{libdisplay_commit}; echo ${c:0:7})
+
+%ifarch x86_64
+%global winepedir x86_64-windows
+%global target_x86_type 64
+%global mingw_sysroot %mingw64_sysroot
+%global mingw_build_win64 1
+%global mingw_build_win32 0
+%else
+%global winepedir i386-windows
+%global target_x86_type 32
+%global mingw_sysroot %mingw32_sysroot
+%global mingw_build_win64 0
+%global mingw_build_win32 1
+%endif
+
+Name:           terra-wine-dxvk
+Version:        2.6.1
+Release:        1
+Summary:        Vulkan-based implementation of D3D8, 9, 10 and 11 for Linux / Wine
+
+License:        zlib AND MIT
+URL:            https://github.com/doitsujin/dxvk
+Source0:        %{url}/archive/v%{version}/dxvk-%{version}.tar.gz
+Source1:        https://gitlab.freedesktop.org/frog/libdisplay-info/-/archive/%{libdisplay_commit}/libdisplay-info-%{libdisplay_shortcommit}.tar.gz
+
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  glslang
+BuildRequires:  meson
+BuildRequires:  terra-wine-staging
+BuildRequires:  wine-staging
+BuildRequires:  wine-staging-devel
+
+%ifarch x86_64
+BuildRequires:  mingw64-filesystem
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-headers
+BuildRequires:  mingw64-cpp
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-gcc-c++
+BuildRequires:  mingw64-winpthreads-static
+BuildRequires:  mingw64-vulkan-headers
+BuildRequires:  mingw64-spirv-headers
+%else
+BuildRequires:  mingw32-filesystem
+BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-headers
+BuildRequires:  mingw32-cpp
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-gcc-c++
+BuildRequires:  mingw32-winpthreads-static
+BuildRequires:  mingw32-vulkan-headers
+BuildRequires:  mingw32-spirv-headers
+%endif
+
+Requires(pre):  vulkan-tools
+
+Requires:       wine-staging%{?_isa}
+Requires:       wine-dxvk-dxgi%{?_isa} = %{version}-%{release}
+Requires:       vulkan-loader%{?_isa}
+
+# We want x86_64 users to always have also 32 bit lib, it's the same what wine does
+%ifarch x86_64
+Requires:       wine-dxvk(x86-32) = %{version}-%{release}
+%endif
+
+# Recommend also d3d8, d3d9, and d3d10
+Recommends:     wine-dxvk-d3d8%{?_isa}  = %{version}-%{release}
+Recommends:     wine-dxvk-d3d9%{?_isa}  = %{version}-%{release}
+Recommends:     wine-dxvk-d3d10%{?_isa} = %{version}-%{release}
+
+Requires(posttrans):   %{_sbindir}/alternatives wine-staging%{?_isa}
+Requires(preun):       %{_sbindir}/alternatives
+
+ExclusiveArch:  %{ix86} x86_64
+
+Provides:       bundled(libdisplay-info) = %(echo %{libdisplay_ver} | sed 's/-/~/g')^git%{libdisplay_shortcommit}
+
+%description
+%{summary}
+
+%package dxgi
+Summary:        DXVK DXGI implementation
+%ifarch x86_64
+Requires:       terra-wine-dxvk-dxgi(x86-32) = %{version}-%{release}
+%endif
+
+%description dxgi
+%{summary}
+
+This package doesn't enable the use of this DXGI implementation,
+it should be installed and overridden per prefix.
+
+%package d3d10
+Summary:        DXVK D3D10 implementation
+
+Requires:       terra-wine-dxvk%{?_isa} = %{version}-%{release}
+
+# We want x86_64 users to always have also 32 bit lib, it's the same what wine does
+%ifarch x86_64
+Requires:       terra-wine-dxvk-d3d10(x86-32) = %{version}-%{release}
+%endif
+
+%description d3d10
+%{summary}
+
+%package d3d9
+Summary:        DXVK D3D9 implementation
+
+Requires:       terra-wine-dxvk%{?_isa} = %{version}-%{release}
+
+# We want x86_64 users to always have also 32 bit lib, it's the same what wine does
+%ifarch x86_64
+Requires:       terra-wine-dxvk-d3d9(x86-32) = %{version}-%{release}
+%endif
+
+%description d3d9
+%{summary}
+
+%package d3d8
+Summary:        DXVK D3D8 implementation
+
+Requires:       terra-wine-dxvk%{?_isa} = %{version}-%{release}
+
+# We want x86_64 users to always have also 32 bit lib, it's the same what wine does
+%ifarch x86_64
+Requires:       terra-wine-dxvk-d3d8(x86-32) = %{version}-%{release}
+%endif
+
+%description d3d8
+%{summary}
+
+%prep
+%autosetup -n dxvk-%{version} -p1 -a1
+rm -rf subprojects/libdisplay-info && mv libdisplay-info-%{libdisplay_commit} subprojects/libdisplay-info
+
+%build
+%mingw_meson --buildtype=plain --wrap-mode=nodownload --auto-features=enabled --cross-file ../build-win%{target_x86_type}.txt --buildtype release
+%mingw_ninja
+
+%install
+%mingw_ninja_install
+winebuild --builtin %buildroot%mingw_sysroot/mingw/bin/dxgi.dll
+winebuild --builtin %buildroot%mingw_sysroot/mingw/bin/d3d8.dll
+winebuild --builtin %buildroot%mingw_sysroot/mingw/bin/d3d9.dll
+winebuild --builtin %buildroot%mingw_sysroot/mingw/bin/d3d10core.dll
+winebuild --builtin %buildroot%mingw_sysroot/mingw/bin/d3d11.dll
+
+mkdir -p %{buildroot}%{_libdir}/wine/%{winepedir}/
+install -p -m 644 %buildroot%mingw_sysroot/mingw/bin/dxgi.dll %{buildroot}%{_libdir}/wine/%{winepedir}/dxvk-dxgi.dll
+install -p -m 644 %buildroot%mingw_sysroot/mingw/bin/d3d8.dll %{buildroot}%{_libdir}/wine/%{winepedir}/dxvk-d3d8.dll
+install -p -m 644 %buildroot%mingw_sysroot/mingw/bin/d3d9.dll %{buildroot}%{_libdir}/wine/%{winepedir}/dxvk-d3d9.dll
+install -p -m 644 %buildroot%mingw_sysroot/mingw/bin/d3d10core.dll %{buildroot}%{_libdir}/wine/%{winepedir}/dxvk-d3d10core.dll
+install -p -m 644 %buildroot%mingw_sysroot/mingw/bin/d3d11.dll %{buildroot}%{_libdir}/wine/%{winepedir}/dxvk-d3d11.dll
+
+# Clean-up
+rm -rf %buildroot%mingw_sysroot/mingw
+
+%posttrans
+if vulkaninfo |& grep "ERROR_INITIALIZATION_FAILED\|ERROR_SURFACE_LOST_KHR\|Vulkan support is incomplete" > /dev/null; then
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d11.dll 'wine-d3d11%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d11.dll 5
+else
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d11.dll 'wine-d3d11%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d11.dll 20
+fi
+
+%posttrans dxgi
+if vulkaninfo |& grep "ERROR_INITIALIZATION_FAILED\|ERROR_SURFACE_LOST_KHR\|Vulkan support is incomplete" > /dev/null; then
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/dxgi.dll 'wine-dxgi%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-dxgi.dll 5
+else
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/dxgi.dll 'wine-dxgi%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-dxgi.dll 20
+fi
+
+%posttrans d3d10
+if vulkaninfo |& grep "ERROR_INITIALIZATION_FAILED\|ERROR_SURFACE_LOST_KHR\|Vulkan support is incomplete" > /dev/null; then
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d10core.dll 'wine-d3d10core%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d10core.dll 5
+else
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d10core.dll 'wine-d3d10core%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d10core.dll 20
+fi
+
+%posttrans d3d9
+if vulkaninfo |& grep "ERROR_INITIALIZATION_FAILED\|ERROR_SURFACE_LOST_KHR\|Vulkan support is incomplete" > /dev/null; then
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d9.dll 'wine-d3d9%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d9.dll 5
+else
+    %{_sbindir}/alternatives --install %{_libdir}/wine/%{winepedir}/d3d9.dll 'wine-d3d9%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d9.dll 20
+fi
+
+%postun
+%{_sbindir}/alternatives --remove 'wine-d3d11%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d11.dll
+
+%postun d3d10
+%{_sbindir}/alternatives --remove 'wine-d3d10core%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d10core.dll
+
+%postun d3d9
+%{_sbindir}/alternatives --remove 'wine-d3d9%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-d3d9.dll
+
+%postun dxgi
+%{_sbindir}/alternatives --remove 'wine-dxgi%{?_isa}' %{_libdir}/wine/%{winepedir}/dxvk-dxgi.dll
+
+%files
+%license LICENSE
+%doc README.md
+%{_libdir}/wine/%{winepedir}/dxvk-d3d11.dll
+
+%files d3d10
+%license LICENSE
+%{_libdir}/wine/%{winepedir}/dxvk-d3d10core.dll
+
+%files d3d9
+%license LICENSE
+%{_libdir}/wine/%{winepedir}/dxvk-d3d9.dll
+
+%files d3d8
+%license LICENSE
+%{_libdir}/wine/%{winepedir}/dxvk-d3d8.dll
+
+%files dxgi
+%license LICENSE
+%{_libdir}/wine/%{winepedir}/dxvk-dxgi.dll
+
+%changelog
+%autochangelog